AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

grid: Use gtk_wiget_measure

Browse Source
This commit is contained in:
Timm Bäder 2016-11-12 15:30:55 +01:00
parent 26746c8369
commit 997fd3c81e
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkgrid.c
View File

@ -662,30 +662,26 @@ compute_request_for_child (GtkGridRequest *request,
*minimum_baseline = -1;
if (natural_baseline)
*natural_baseline = -1;
if (contextual)
{
gint size;
size = compute_allocation_for_child (request, child, 1 - orientation);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_widget_get_preferred_width_for_height (child->widget,
size,
minimum, natural);
else
gtk_widget_get_preferred_height_and_baseline_for_width (child->widget,
size,
minimum, natural,
minimum_baseline, natural_baseline);
gtk_widget_measure (child->widget,
orientation,
size,
minimum, natural,
minimum_baseline, natural_baseline);
}
else
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_widget_get_preferred_width (child->widget, minimum, natural);
else
gtk_widget_get_preferred_height_and_baseline_for_width (child->widget,
-1,
minimum, natural,
minimum_baseline, natural_baseline);
gtk_widget_measure (child->widget,
orientation,
-1,
minimum, natural,
minimum_baseline, natural_baseline);
}
}