[gimp/gtk3-port: 38/224] app: use gtk_widget_get_preferred_size() instead of size_request()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 38/224] app: use gtk_widget_get_preferred_size() instead of size_request()
- Date: Wed, 1 Feb 2012 20:01:15 +0000 (UTC)
commit 8905891a37dc0261824badcb006c4c2001504e56
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 19 12:23:37 2010 +0200
app: use gtk_widget_get_preferred_size() instead of size_request()
app/display/gimpstatusbar.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 99e49cc..d44ac1d 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -305,26 +305,31 @@ 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->cancel_button, &child_requisition);
+ gtk_widget_get_preferred_size (statusbar->cancel_button,
+ &child_requisition, NULL);
requisition->height = MAX (requisition->height,
child_requisition.height);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]