From df65b0bdcdd09a391ac826482b9d49470b1d053f Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 19 Oct 2010 12:23:37 +0200 Subject: [PATCH] app: use gtk_widget_get_preferred_size() instead of size_request() --- app/display/gimpstatusbar.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c index 49684d2b79..9a446ee774 100644 --- a/app/display/gimpstatusbar.c +++ b/app/display/gimpstatusbar.c @@ -403,30 +403,36 @@ gimp_statusbar_hbox_size_request (GtkWidget *widget, /* also consider the children which can be invisible */ - gtk_widget_size_request (statusbar->cursor_label, &child_requisition); + gtk_widget_get_preferred_size (statusbar->cursor_label, + &child_requisition, NULL); width += child_requisition.width; requisition->height = MAX (requisition->height, child_requisition.height); - gtk_widget_size_request (statusbar->unit_combo, &child_requisition); + gtk_widget_get_preferred_size (statusbar->unit_combo, + &child_requisition, NULL); width += child_requisition.width; requisition->height = MAX (requisition->height, child_requisition.height); - gtk_widget_size_request (statusbar->scale_combo, &child_requisition); + gtk_widget_get_preferred_size (statusbar->scale_combo, + &child_requisition, NULL); width += child_requisition.width; requisition->height = MAX (requisition->height, child_requisition.height); - gtk_widget_size_request (statusbar->progressbar, &child_requisition); + gtk_widget_get_preferred_size (statusbar->progressbar, + &child_requisition, NULL); requisition->height = MAX (requisition->height, child_requisition.height); - gtk_widget_size_request (statusbar->label, &child_requisition); + gtk_widget_get_preferred_size (statusbar->label, + &child_requisition, NULL); requisition->height = MAX (requisition->height, child_requisition.height); - gtk_widget_size_request (statusbar->cancel_button, &child_requisition); + gtk_widget_get_preferred_size (statusbar->cancel_button, + &child_requisition, NULL); requisition->height = MAX (requisition->height, child_requisition.height);