Set the variable display width instead of adding an override.

[pspp] / src / ui / gui / psppire-dict.c

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 7923079d173c15393b4e1ced26cd61e050c3b8d9..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
 };
 
@@ -113,7 +116,8 @@ gi (GListModel *list, guint id)
        g_object_unref (G_OBJECT (context));
       
        gtk_widget_set_size_request (button,
-                                    var_get_display_width (v) * rect.width / PANGO_SCALE,
+                                    (0.25 + var_get_display_width (v))
+                                    * rect.width / PANGO_SCALE,
                                     -1);
       }
     }
@@ -196,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),