1
From 12d6b0fe6251e77dbda8c3daeefacb028a267750 Mon Sep 17 00:00:00 2001
2
From: Benjamin Otte <otte@redhat.com>
3
Date: Thu, 05 Apr 2012 09:30:41 +0000
4
Subject: paned: Shrinkable widgets don't require a size
6
This could otherwise lead to very funny size request behaviors, in
9
https://bugzilla.gnome.org/show_bug.cgi?id=587441
11
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
12
index f2fbe13..5b374b2 100644
15
@@ -904,7 +904,10 @@ gtk_paned_get_preferred_size (GtkWidget *widget,
16
if (priv->child1 && gtk_widget_get_visible (priv->child1))
18
get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat);
19
- *minimum = child_min;
20
+ if (priv->child1_shrink && priv->orientation == orientation)
23
+ *minimum = child_min;
27
@@ -914,7 +917,8 @@ gtk_paned_get_preferred_size (GtkWidget *widget,
29
if (priv->orientation == orientation)
31
- *minimum += child_min;
32
+ if (!priv->child2_shrink)
33
+ *minimum += child_min;
34
*natural += child_nat;