AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkModelButton: protect against show_all

Browse Source 
We don't want the labels to be shown when there's already
an icon.
This commit is contained in:
Matthias Clasen 2014-11-06 15:01:03 -05:00
parent 41bf293efd
commit f229f96d69
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkmodelbutton.c
View File

@ -975,8 +975,10 @@ gtk_model_button_init (GtkModelButton *button)
gtk_widget_set_halign (button->box, GTK_ALIGN_FILL); gtk_widget_set_halign (button->box, GTK_ALIGN_FILL);
gtk_widget_show (button->box); gtk_widget_show (button->box);
button->image = gtk_image_new (); button->image = gtk_image_new ();
gtk_widget_set_no_show_all (button->image, TRUE);
g_object_set (button->image, "margin", 4, NULL); g_object_set (button->image, "margin", 4, NULL);
button->label = gtk_label_new (""); button->label = gtk_label_new ("");
gtk_widget_set_no_show_all (button->label, TRUE);
gtk_container_add (GTK_CONTAINER (button->box), button->image); gtk_container_add (GTK_CONTAINER (button->box), button->image);
gtk_container_add (GTK_CONTAINER (button->box), button->label); gtk_container_add (GTK_CONTAINER (button->box), button->label);
gtk_container_add (GTK_CONTAINER (button), button->box); gtk_container_add (GTK_CONTAINER (button), button->box);