diff options
| author | Timm Bäder <mail@baedert.org> | 2016-12-01 19:33:38 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2016-12-04 12:00:46 +0100 |
| commit | 1ab3d32808146b4e79e86facc3710eb91b8e4e28 (patch) | |
| tree | ef782ff659fe40c0effe37decf6d7a6d6c136057 /gtk/gtkrevealer.c | |
| parent | 7f8d0acfd30b79fb862af9949fb4dbd845c2c4b5 (diff) | |
| download | gtk+-1ab3d32808146b4e79e86facc3710eb91b8e4e28.tar.gz | |
revealer: Measure child widget size using gtk_widget_measure
Diffstat (limited to 'gtk/gtkrevealer.c')
| -rw-r--r-- | gtk/gtkrevealer.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c index c9e7693824..e42be2e37b 100644 --- a/gtk/gtkrevealer.c +++ b/gtk/gtkrevealer.c @@ -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); |