Set variable display width when datasheet's columns are resized.

[pspp-builds.git] / src / ui / gui / psppire-data-editor.c

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 674af4ec4db8efe6c76488dbf2534e5e7f946f80..dcc2cdf8e7ba58be3571b20628ce5d7f9dc2b053 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -280,6 +280,18 @@ width_of_m (GtkWidget *w)
   return rect.width;
 }
 
+/* Callback for the axis' resize signal.
+   Changes the variable's display width */
+static void
+rewidth_variable (PsppireDataEditor *de, gint unit, glong size)
+{
+  const PsppireDict *dict = de->data_store->dict;
+  struct variable *var = psppire_dict_get_variable (dict, unit);
+
+  var_set_display_width (var, size / (float) width_of_m (de));
+}
+
+
 static void
 new_variables_callback (PsppireDict *dict, gpointer data)
 {
@@ -298,6 +310,9 @@ new_variables_callback (PsppireDict *dict, gpointer data)
       PsppireAxisImpl *haxis;
       g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
 
+      g_signal_connect_swapped (haxis, "resize-unit",
+                               G_CALLBACK (rewidth_variable), de);
+
       psppire_axis_impl_clear (haxis);
 
       for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
@@ -828,10 +843,11 @@ on_map (GtkWidget *w)
 
 static void
 init_sheet (PsppireDataEditor *de, int i,
-           GtkAdjustment *hadj, GtkAdjustment *vadj)
+           GtkAdjustment *hadj, GtkAdjustment *vadj,
+           PsppireAxisImpl *vaxis,
+           PsppireAxisImpl *haxis
+           )
 {
-  PsppireAxisImpl *haxis = psppire_axis_impl_new ();
-  PsppireAxisImpl *vaxis = psppire_axis_impl_new ();
   de->sheet_bin[i] = gtk_scrolled_window_new (hadj, vadj);
 
   de->data_sheet[i] = gtk_sheet_new (NULL);
@@ -861,38 +877,46 @@ init_sheet (PsppireDataEditor *de, int i,
 static void
 init_data_sheet (PsppireDataEditor *de)
 {
-  GtkAdjustment *va0, *ha0;
-  GtkAdjustment *va1, *ha1;
+  GtkAdjustment *vadj0, *hadj0;
+  GtkAdjustment *vadj1, *hadj1;
   GtkWidget *sheet ;
 
+  PsppireAxisImpl *vaxis0 = psppire_axis_impl_new ();
+  PsppireAxisImpl *vaxis1 = psppire_axis_impl_new ();
+
+  /* There's only one horizontal axis, since the
+     column widths are parameters of the variables */
+  PsppireAxisImpl *haxis = psppire_axis_impl_new ();
+
+
   de->split = TRUE;
   de->paned = gtk_xpaned_new ();
 
-  init_sheet (de, 0, NULL, NULL);
+  init_sheet (de, 0, NULL, NULL, vaxis0, haxis);
   gtk_widget_show (de->sheet_bin[0]);
-  va0 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
-  ha0 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
+  vadj0 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
+  hadj0 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[0]));
 
   g_object_set (de->sheet_bin[0], "vscrollbar-policy", GTK_POLICY_NEVER, NULL);
   g_object_set (de->sheet_bin[0], "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
 
-  init_sheet (de, 1, NULL, va0);
+  init_sheet (de, 1, NULL, vadj0, vaxis0, haxis);
   gtk_widget_show (de->sheet_bin[1]);
   sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[1]));
   gtk_sheet_hide_row_titles (GTK_SHEET (sheet));
-  ha1 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[1]));
+  hadj1 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[1]));
   g_object_set (de->sheet_bin[1], "vscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
   g_object_set (de->sheet_bin[1], "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
 
-  init_sheet (de, 2, ha0, NULL);
+  init_sheet (de, 2, hadj0, NULL, vaxis1, haxis);
   gtk_widget_show (de->sheet_bin[2]);
   sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[2]));
   gtk_sheet_hide_column_titles (GTK_SHEET (sheet));
   g_object_set (de->sheet_bin[2], "vscrollbar-policy", GTK_POLICY_NEVER, NULL);
   g_object_set (de->sheet_bin[2], "hscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
-  va1 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[2]));
+  vadj1 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[2]));
 
-  init_sheet (de, 3, ha1, va1);
+  init_sheet (de, 3, hadj1, vadj1, vaxis1, haxis);
   gtk_widget_show (de->sheet_bin[3]);
   sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[3]));
   gtk_sheet_hide_column_titles (GTK_SHEET (sheet));