Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

box gadget: Fix height-for-width handling

Browse Source 
When measuring children while distributing a given height,
we must measure them for the given width that goes with
the height. Otherwise, things will go wrong if some of the
children do actual width-for-height. This was showing up
as misaligned images in anaconda.

https://bugzilla.gnome.org/show_bug.cgi?id=760967
This commit is contained in:
Matthias Clasen
2016-01-22 17:10:41 -05:00
parent f32a54fb70
commit 3d52fd3992
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkboxgadget.c
View File

@@ -109,6 +109,7 @@ gtk_box_gadget_measure_child (GObject *child,
static void
gtk_box_gadget_distribute (GtkBoxGadget *gadget,
gint for_size,
gint size,
GtkRequestedSize *sizes)
{
@@ -123,7 +124,7 @@ gtk_box_gadget_distribute (GtkBoxGadget *gadget,
gtk_box_gadget_measure_child (child->object,
priv->orientation,
-1,
for_size,
&sizes[i].minimum_size, &sizes[i].natural_size,
NULL, NULL);
if (gtk_box_gadget_child_is_visible (child->object) &&
@@ -152,6 +153,7 @@ gtk_box_gadget_distribute (GtkBoxGadget *gadget,
size -= size / n_expand;
n_expand--;
}
}
static void
@@ -203,7 +205,7 @@ gtk_box_gadget_measure_opposite (GtkCssGadget *gadget,
if (for_size >= 0)
{
sizes = g_newa (GtkRequestedSize, priv->children->len);
gtk_box_gadget_distribute (GTK_BOX_GADGET (gadget), for_size, sizes);
gtk_box_gadget_distribute (GTK_BOX_GADGET (gadget), -1, for_size, sizes);
}
above_min = below_min = above_nat = below_nat = -1;
@@ -303,7 +305,7 @@ gtk_box_gadget_allocate (GtkCssGadget *gadget,
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
gtk_box_gadget_distribute (GTK_BOX_GADGET (gadget), allocation->width, sizes);
gtk_box_gadget_distribute (GTK_BOX_GADGET (gadget), allocation->height, allocation->width, sizes);
if (baseline < 0)
{
@@ -377,7 +379,7 @@ gtk_box_gadget_allocate (GtkCssGadget *gadget,
}
else
{
gtk_box_gadget_distribute (GTK_BOX_GADGET (gadget), allocation->height, sizes);
gtk_box_gadget_distribute (GTK_BOX_GADGET (gadget), allocation->width, allocation->height, sizes);
for (i = 0 ; i < priv->children->len; i++)
{