AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-30 15:31:34 +00:00
Code Issues Projects Releases Wiki Activity

revealer: Measure child widget size using gtk_widget_measure

Browse Source
This commit is contained in:
Timm Bäder 2016-12-01 19:33:38 +01:00
parent 7f8d0acfd3
commit 1ab3d32808
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkrevealer.c
View File

@ -316,11 +316,13 @@ gtk_revealer_get_child_allocation (GtkRevealer *revealer,
transition = effective_transition (revealer);
if (transition == GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT ||
transition == GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT)
gtk_widget_get_preferred_width_for_height (child, MAX (0, allocation->height - vertical_padding), NULL,
&child_allocation->width);
gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL,
MAX (0, allocation->height - vertical_padding),
NULL, &child_allocation->width, NULL, NULL);
else
gtk_widget_get_preferred_height_for_width (child, MAX (0, allocation->width - horizontal_padding), NULL,
&child_allocation->height);
gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL,
MAX (0, allocation->width - horizontal_padding),
NULL, &child_allocation->height, NULL, NULL);
}
child_allocation->width = MAX (child_allocation->width, allocation->width - horizontal_padding);