From 78e51a4f3f499d9a8f109abec5183b7c210b206b Mon Sep 17 00:00:00 2001 From: TingPing Date: Tue, 21 Apr 2015 15:35:15 -0400 Subject: [PATCH] Fix mode button text being cut off This no longer restricts their width and uses monospace fonts so they are still the same width. Closes #1356 Fixes #1354 --- src/fe-gtk/maingui.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index ee1854c0..11b88ad9 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -2003,17 +2003,24 @@ mg_flagbutton_cb (GtkWidget *but, char *flag) static GtkWidget * mg_create_flagbutton (char *tip, GtkWidget *box, char *face) { - GtkWidget *wid; + GtkWidget *btn, *lbl; + char label_markup[16]; - wid = gtk_toggle_button_new_with_label (face); - gtk_widget_set_size_request (wid, 18, 0); - gtk_widget_set_tooltip_text (wid, tip); - gtk_box_pack_start (GTK_BOX (box), wid, 0, 0, 0); - g_signal_connect (G_OBJECT (wid), "toggled", + g_snprintf (label_markup, sizeof(label_markup), "%s", face); + lbl = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL(lbl), label_markup); + + btn = gtk_toggle_button_new (); + gtk_widget_set_size_request (btn, -1, 0); + gtk_widget_set_tooltip_text (btn, tip); + gtk_container_add (GTK_CONTAINER(btn), lbl); + + gtk_box_pack_start (GTK_BOX (box), btn, 0, 0, 0); + g_signal_connect (G_OBJECT (btn), "toggled", G_CALLBACK (mg_flagbutton_cb), face); - show_and_unfocus (wid); + show_and_unfocus (btn); - return wid; + return btn; } static void