AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

headerbar: compute nominal size of sides up front

Browse Source 
In order to support the expand property on children, we're
going to need to look at the size of the packed children
on each side of the title widget, up front, before allocating
them (to compute how much extra allocation each expanded child
gets).

This commit lays the groundwork for that analysis by splitting
the size calculation of each side of the header bar outside
of the loop that allocates each child of the header bar.

https://bugzilla.gnome.org/show_bug.cgi?id=724332
This commit is contained in:
Ray Strode 2016-06-24 12:16:40 -04:00
parent eccfce50d6
commit 847a43c431
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkheaderbar.c
View File

@ -1074,7 +1074,28 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
width = gtk_distribute_natural_allocation (MAX (0, width), nvis_children, sizes);
side[0] = side[1] = 0;
/* compute the nominal size of the children filling up each side of
* the title in titlebar
*/
side[0] = start_width;
side[1] = end_width;
for (packing = GTK_PACK_START; packing <= GTK_PACK_END; packing++)
{
i = 0;
for (l = priv->children; l != NULL; l = l->next)
{
child = l->data;
if (!gtk_widget_get_visible (child->widget))
continue;
if (child->pack_type == packing)
side[packing] += sizes[i].minimum_size + priv->spacing;
i++;
}
}
/* allocate the children on both sides of the title */
for (packing = GTK_PACK_START; packing <= GTK_PACK_END; packing++)
{
child_allocation.y = allocation->y;
@ -1111,8 +1132,6 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
x -= priv->spacing;
}
side[packing] += child_size + priv->spacing;
if (direction == GTK_TEXT_DIR_RTL)
child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
@ -1123,9 +1142,6 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
}
}
side[0] += start_width;
side[1] += end_width;
/* We don't enforce css borders on the center widget, to make
* title/subtitle combinations fit without growing the header
*/