paned: Properly hide panes that were set to invisible

[~andy/gtk] / gtk / gtkpaned.c

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 85c4200ff535832387060be544c5bbf3cb29059b..e7b334a65c9aab1d007d94533645915b404d2dee 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1224,11 +1224,6 @@ gtk_paned_size_allocate (GtkWidget     *widget,
       if (gtk_widget_get_realized (widget))
        gdk_window_hide (priv->handle);
 
-      if (priv->child1)
-        gtk_paned_set_child_visible (paned, 0, TRUE);
-      if (priv->child2)
-        gtk_paned_set_child_visible (paned, 1, TRUE);
-
       window_allocation.x = allocation->x;
       window_allocation.y = allocation->y;
       window_allocation.width = allocation->width;
@@ -1239,6 +1234,10 @@ gtk_paned_size_allocate (GtkWidget     *widget,
 
       if (priv->child1 && gtk_widget_get_visible (priv->child1))
         {
+          gtk_paned_set_child_visible (paned, 0, TRUE);
+          if (priv->child2)
+            gtk_paned_set_child_visible (paned, 1, FALSE);
+
           gtk_paned_child_allocate (priv->child1,
                                     priv->child1_window,
                                     &window_allocation,
@@ -1246,11 +1245,22 @@ gtk_paned_size_allocate (GtkWidget     *widget,
         }
       else if (priv->child2 && gtk_widget_get_visible (priv->child2))
         {
+          gtk_paned_set_child_visible (paned, 1, TRUE);
+          if (priv->child1)
+            gtk_paned_set_child_visible (paned, 0, FALSE);
+
           gtk_paned_child_allocate (priv->child2,
                                     priv->child2_window,
                                     &window_allocation,
                                     &child_allocation);
         }
+      else
+        {
+          if (priv->child1)
+            gtk_paned_set_child_visible (paned, 0, FALSE);
+          if (priv->child2)
+            gtk_paned_set_child_visible (paned, 1, FALSE);
+        }
     }
 }