From 1aed96f34f5ebae51e58c96f95ba486299c73f8b Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 12 May 2011 22:10:07 -0700
Subject: [PATCH] gui: Make AGGREGATE dialog initially show all of the right
 pane.

The AGGREGATE dialog initially had a very narrow left pane, so
commit 2e6cffa44ef5 "Aggregate dialog: Initialize HPane widget width
on opening" added a callback function to adjust the position of the
divider between the panes to half the window's width.  But this
happens after the window has been laid out, which means that unless
the window is very wide to begin with, it will cause part of the
right pane to disappear.

I was able to get more consistently good results by forcing a minimum
width for the left pane with a width_request, and making the right
pane shrinkable below the minimum size needed to show all of it.  A
final tweak was to make the left pane automatically grow with the
window.

If you've already used the Aggregate dialog then your preferences for
the window size have been saved, so for testing this it is best to
remove $HOME/.config/psppire before each experiment.

Bug #31126.
---
 src/ui/gui/aggregate-dialog.c | 2 +-
 src/ui/gui/aggregate.ui       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ui/gui/aggregate-dialog.c b/src/ui/gui/aggregate-dialog.c
index 7414c4df..207bbd4d 100644
--- a/src/ui/gui/aggregate-dialog.c
+++ b/src/ui/gui/aggregate-dialog.c
@@ -456,7 +456,7 @@ set_initial_pos (GtkPaned *pane)
 		"max-position", &max_pos,
 		NULL);
 
-  gtk_paned_set_position (pane, max_pos / 2);
+  gtk_paned_set_position (pane, max_pos);
 }
 
 
diff --git a/src/ui/gui/aggregate.ui b/src/ui/gui/aggregate.ui
index 193d112d..8cbcf2af 100644
--- a/src/ui/gui/aggregate.ui
+++ b/src/ui/gui/aggregate.ui
@@ -17,6 +17,7 @@
             <property name="visible">True</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="width_request">200</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">automatic</property>
@@ -34,7 +35,7 @@
                 </child>
               </object>
               <packing>
-                <property name="resize">False</property>
+                <property name="resize">True</property>
                 <property name="shrink">True</property>
               </packing>
             </child>
@@ -337,7 +338,7 @@
               </object>
               <packing>
                 <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
           </object>
-- 
2.30.2