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

stack: Use measure() to measure child widget

Browse Source 
Simpler code this way \o/
This commit is contained in:
Timm Bäder 2016-10-27 09:38:45 +02:00
parent 6eb3d98de0
commit 82d38e35f8
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkstack.c
View File

@ -2330,20 +2330,7 @@ gtk_stack_measure (GtkCssGadget *gadget,
if (gtk_widget_get_visible (child)) if (gtk_widget_get_visible (child))
{ {
if (orientation == GTK_ORIENTATION_VERTICAL) gtk_widget_measure (child, orientation, for_size, &child_min, &child_nat, NULL, NULL);
{
if (for_size < 0)
gtk_widget_get_preferred_height (child, &child_min, &child_nat);
else
gtk_widget_get_preferred_height_for_width (child, for_size, &child_min, &child_nat);
}
else
{
if (for_size < 0)
gtk_widget_get_preferred_width (child, &child_min, &child_nat);
else
gtk_widget_get_preferred_width_for_height (child, for_size, &child_min, &child_nat);
}
*minimum = MAX (*minimum, child_min); *minimum = MAX (*minimum, child_min);
*natural = MAX (*natural, child_nat); *natural = MAX (*natural, child_nat);