diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-11-03 18:52:28 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-11-04 15:28:43 +0100 |
| commit | c3148a81d23296aff5a1836aa7e68b8c6e411f45 (patch) | |
| tree | 6f8cab9bd39f3e420b7335d0baa5345d4fec57e3 /gtk/gtksizerequest.c | |
| parent | aba0c5cc3ba1f10492c9d9013802e287067b0bf7 (diff) | |
| download | gtk+-c3148a81d23296aff5a1836aa7e68b8c6e411f45.tar.gz | |
sizerequest: Move optimization
With size groups now doing hfw, doing the optimization for CONSTANT_SIZE
was done too early. Size groups need to know that it's a hfw request, so
the other widgets in the size group get the correct behavior.
Diffstat (limited to 'gtk/gtksizerequest.c')
| -rw-r--r-- | gtk/gtksizerequest.c | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index f9a9d93c4d..1559be9a41 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -354,7 +354,7 @@ _gtk_widget_compute_size_for_orientation (GtkWidget *widget, if (orientation == GTK_SIZE_GROUP_HORIZONTAL) { - if (for_size < 0) + if (for_size < 0 || gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_CONSTANT_SIZE) { push_recursion_check (widget, orientation, for_size); GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_size, &nat_size); @@ -387,7 +387,7 @@ _gtk_widget_compute_size_for_orientation (GtkWidget *widget, } else { - if (for_size < 0) + if (for_size < 0 || gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_CONSTANT_SIZE) { push_recursion_check (widget, orientation, for_size); GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, &min_size, &nat_size); @@ -623,20 +623,12 @@ gtk_widget_get_preferred_width_for_height (GtkWidget *widget, g_return_if_fail (minimum_width != NULL || natural_width != NULL); g_return_if_fail (height >= 0); - if (GTK_WIDGET_GET_CLASS (widget)->get_request_mode (widget) == GTK_SIZE_REQUEST_CONSTANT_SIZE) - _gtk_widget_compute_size_for_orientation (widget, - GTK_SIZE_GROUP_HORIZONTAL, - FALSE, - -1, - minimum_width, - natural_width); - else - _gtk_widget_compute_size_for_orientation (widget, - GTK_SIZE_GROUP_HORIZONTAL, - FALSE, - height, - minimum_width, - natural_width); + _gtk_widget_compute_size_for_orientation (widget, + GTK_SIZE_GROUP_HORIZONTAL, + FALSE, + height, + minimum_width, + natural_width); } /** @@ -667,20 +659,12 @@ gtk_widget_get_preferred_height_for_width (GtkWidget *widget, g_return_if_fail (minimum_height != NULL || natural_height != NULL); g_return_if_fail (width >= 0); - if (GTK_WIDGET_GET_CLASS (widget)->get_request_mode (widget) == GTK_SIZE_REQUEST_CONSTANT_SIZE) - _gtk_widget_compute_size_for_orientation (widget, - GTK_SIZE_GROUP_VERTICAL, - FALSE, - -1, - minimum_height, - natural_height); - else - _gtk_widget_compute_size_for_orientation (widget, - GTK_SIZE_GROUP_VERTICAL, - FALSE, - width, - minimum_height, - natural_height); + _gtk_widget_compute_size_for_orientation (widget, + GTK_SIZE_GROUP_VERTICAL, + FALSE, + width, + minimum_height, + natural_height); } /** |