[gtk+/wip/baedert/children: 17/30] revealer: Measure child widget size using gtk_widget_measure



commit a5b7ff1f634e879b803b9ec3370722838620f864
Author: Timm Bäder <mail baedert org>
Date:   Thu Dec 1 19:33:38 2016 +0100

    revealer: Measure child widget size using gtk_widget_measure

 gtk/gtkrevealer.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c
index c9e7693..e42be2e 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]