X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=7923079d173c15393b4e1ced26cd61e050c3b8d9;hb=fb224459eed00514cbc36ecbc311c644f8b22def;hp=3bc39e40959c61a6f9db9d1d895d84d9a2d479d7;hpb=656e46ed80e20bf34312f01607a7bebdd2d8d622;p=pspp

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 3bc39e4095..7923079d17 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -99,6 +99,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));
+
+      {
+	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_get_extents (layout, NULL, &rect);
+      
+	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);
+      }
     }
 
   return button;
@@ -190,10 +207,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",
@@ -206,7 +220,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  1,
 		  G_TYPE_INT);
 
-
   signals [VARIABLE_DELETED] =
     g_signal_new ("variable-deleted",
 		  G_TYPE_FROM_CLASS (class),
@@ -220,7 +233,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),
@@ -232,7 +244,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  1,
 		  G_TYPE_INT);
 
-
   signals [FILTER_CHANGED] =
     g_signal_new ("filter-changed",
 		  G_TYPE_FROM_CLASS (class),
@@ -244,7 +255,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  1,
 		  G_TYPE_INT);
 
-
   signals [SPLIT_CHANGED] =
     g_signal_new ("split-changed",
 		  G_TYPE_FROM_CLASS (class),
@@ -946,8 +956,6 @@ psppire_dict_dump (const PsppireDict *dict)
 #endif
 
 
-
-
 const gchar *
 psppire_dict_encoding (const PsppireDict *dict)
 {