From 997fd3c81ef323304592af807e866d93fd16eb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Sat, 12 Nov 2016 15:30:55 +0100 Subject: grid: Use gtk_wiget_measure --- gtk/gtkgrid.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'gtk/gtkgrid.c') diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 729904c025..d96ce7fcdb 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -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); } } -- cgit v1.2.1