X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=0afb889037788e74b577581844d0c5306065bbcf;hb=a9e5621ea36156f1855bfa701f9fae07a648c844;hp=f491ebff7161c71a6064eb25172c2752cca07434;hpb=bdb47a82fa02e10352fe188e3b4a67d5f637424c;p=pspp

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index f491ebff71..0afb889037 100644
--- 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
 };
 
@@ -100,21 +103,23 @@ gi (GListModel *list, guint id)
       gtk_button_set_label (GTK_BUTTON (button),  var_get_name (v));
       gtk_widget_set_tooltip_text (button, var_get_label (v));
 
-      PangoRectangle rect;
-      
-      PangoContext *context = gtk_widget_create_pango_context (button);
-      PangoLayout *layout = pango_layout_new (context);
+      {
+	PangoContext *context = gtk_widget_create_pango_context (button);
+	PangoLayout *layout = pango_layout_new (context);
+	PangoRectangle rect;
       
-      pango_layout_set_text (layout, "M", 1);
+	pango_layout_set_text (layout, "M", 1);
       
-      pango_layout_get_extents (layout, NULL, &rect);
+	pango_layout_get_extents (layout, NULL, &rect);
       
-      g_object_unref (G_OBJECT (layout));
-      g_object_unref (G_OBJECT (context));
+	g_object_unref (G_OBJECT (layout));
+	g_object_unref (G_OBJECT (context));
       
-      gtk_widget_set_size_request (button,
-				   var_get_display_width (v) * rect.width / PANGO_SCALE,
-				   -1);
+	gtk_widget_set_size_request (button,
+				     (0.25 + var_get_display_width (v))
+				     * rect.width / PANGO_SCALE,
+				     -1);
+      }
     }
 
   return button;
@@ -195,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),
@@ -206,10 +223,7 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  3,
 		  G_TYPE_INT,
 		  G_TYPE_UINT,
-		  G_TYPE_POINTER
-		  );
-
-
+		  G_TYPE_POINTER);
 
   signals [VARIABLE_INSERTED] =
     g_signal_new ("variable-inserted",
@@ -222,7 +236,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  1,
 		  G_TYPE_INT);
 
-
   signals [VARIABLE_DELETED] =
     g_signal_new ("variable-deleted",
 		  G_TYPE_FROM_CLASS (class),
@@ -236,7 +249,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  G_TYPE_INT,
 		  G_TYPE_INT);
 
-
   signals [WEIGHT_CHANGED] =
     g_signal_new ("weight-changed",
 		  G_TYPE_FROM_CLASS (class),
@@ -248,7 +260,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  1,
 		  G_TYPE_INT);
 
-
   signals [FILTER_CHANGED] =
     g_signal_new ("filter-changed",
 		  G_TYPE_FROM_CLASS (class),
@@ -260,7 +271,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  1,
 		  G_TYPE_INT);
 
-
   signals [SPLIT_CHANGED] =
     g_signal_new ("split-changed",
 		  G_TYPE_FROM_CLASS (class),
@@ -962,8 +972,6 @@ psppire_dict_dump (const PsppireDict *dict)
 #endif
 
 
-
-
 const gchar *
 psppire_dict_encoding (const PsppireDict *dict)
 {