Set the variable display width instead of adding an override.

When the column width is dragged in the datasheet, instead of adding
a size override, change the variable's display width accordingly.

diff --git a/src/ui/gui/marshaller-list b/src/ui/gui/marshaller-list
index 5b6c0e5b586f1eb12a07b63946fa86023bc915d9..467dcc40a50b817bbebecf66fc2682078c1e9af2 100644 (file)
--- a/src/ui/gui/marshaller-list
+++ b/src/ui/gui/marshaller-list
@@ -7,6 +7,7 @@ BOOLEAN:ENUM,INT
 BOOLEAN:INT
 BOOLEAN:OBJECT
 BOOLEAN:VOID
+BOOLEAN:INT,INT
 VOID:BOXED,OBJECT
 VOID:INT,INT
 VOID:OBJECT,OBJECT

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 8cc32859a4f1c90c81ad3149d8304da28a94deca..6aa3d19d683fa9b89453b237f80c9e0e003680ed 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -17,6 +17,7 @@
 
 #include <config.h>
 #include "psppire-data-sheet.h"
+#include <math.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -386,6 +387,33 @@ button_post_create (GtkWidget *button, guint i, gpointer user_data)
   g_signal_connect_after (button, "draw", G_CALLBACK (indicate_filtered_case), data_store);
 }
 
+
+static gboolean
+resize_display_width (PsppireDict *dict, gint pos, gint size, gpointer user_data)
+{
+  if (pos < 0)
+    return FALSE;
+
+  PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (user_data);
+  PangoContext *context = gtk_widget_create_pango_context (GTK_WIDGET (sheet));
+  PangoLayout *layout = pango_layout_new (context);
+  PangoRectangle rect;
+  
+  pango_layout_set_text (layout, "M", 1);
+  pango_layout_get_extents (layout, NULL, &rect);
+  
+  gdouble width_of_M = rect.width / (gdouble) PANGO_SCALE;
+  
+  g_object_unref (G_OBJECT (layout));
+  g_object_unref (G_OBJECT (context));
+  
+  gint Ms = round ((size / width_of_M) - 0.25);
+  struct variable *var = psppire_dict_get_variable (dict, pos);
+  g_return_val_if_fail (var, TRUE);
+  var_set_display_width (var, Ms);
+  return TRUE;
+}
+
 static void
 set_dictionary (PsppireDataSheet *sheet)
 {
@@ -395,6 +423,8 @@ set_dictionary (PsppireDataSheet *sheet)
   PsppireDataStore *store = PSPPIRE_DATA_STORE (data_model);
   g_object_set (sheet, "hmodel", store->dict, NULL);
 
+  g_signal_connect (store->dict, "resize-item", G_CALLBACK (resize_display_width),
+                   sheet);
 
   SswAxisModel *vmodel = NULL;
   g_object_get (sheet, "vmodel", &vmodel, NULL);

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 7a8245f2bd21ae09d20b1e1329bc711875285274..0afb889037788e74b577581844d0c5306065bbcf 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -55,6 +55,9 @@ enum  {
   WEIGHT_CHANGED,
   FILTER_CHANGED,
   SPLIT_CHANGED,
+
+  RESIZE_ITEM,
+
   n_SIGNALS
 };
 
@@ -197,6 +200,18 @@ psppire_dict_class_init (PsppireDictClass *class)
 
   object_class->dispose = psppire_dict_dispose;
 
+  signals [RESIZE_ITEM] =
+    g_signal_new ("resize-item",
+                 G_TYPE_FROM_CLASS (class),
+                 G_SIGNAL_RUN_LAST,
+                 0,
+                 NULL, NULL,
+                 psppire_marshal_BOOLEAN__INT_INT,
+                 G_TYPE_BOOLEAN,
+                 2,
+                 G_TYPE_INT,
+                 G_TYPE_INT);
+
   signals [VARIABLE_CHANGED] =
     g_signal_new ("variable-changed",
                  G_TYPE_FROM_CLASS (class),