dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: use gtk_widget_get_preferred_size() instead of size_request()

This commit is contained in:
Michael Natterer 2010-10-19 12:23:37 +02:00
parent e888be6a9a
commit df65b0bdcd
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/display/gimpstatusbar.c
View File

@ -403,30 +403,36 @@ gimp_statusbar_hbox_size_request (GtkWidget *widget,
/* also consider the children which can be invisible */ /* 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; width += child_requisition.width;
requisition->height = MAX (requisition->height, requisition->height = MAX (requisition->height,
child_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; width += child_requisition.width;
requisition->height = MAX (requisition->height, requisition->height = MAX (requisition->height,
child_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; width += child_requisition.width;
requisition->height = MAX (requisition->height, requisition->height = MAX (requisition->height,
child_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, requisition->height = MAX (requisition->height,
child_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, requisition->height = MAX (requisition->height,
child_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, requisition->height = MAX (requisition->height,
child_requisition.height); child_requisition.height);