AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 19:00:08 +00:00
Code Issues Projects Releases Wiki Activity

tool button: Update style classes

Browse Source 
When changing tool button contents according to the toolbar-style
property, we need to update the style classes to ensure that the
visual style matches.

https://bugzilla.gnome.org/show_bug.cgi?id=760560
This commit is contained in:
Matthias Clasen 2016-03-04 20:48:13 -05:00
parent 5a42c2e478
commit b84cf5f349
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtktoolbutton.c
View File

@ -601,6 +601,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
if (icon)
gtk_container_add (GTK_CONTAINER (button->priv->button), icon);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
gtk_style_context_remove_class (gtk_widget_get_style_context (button->priv->button), "text-button");
break;
case GTK_TOOLBAR_BOTH:
@ -612,6 +613,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (button->priv->button), box);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "text-button");
break;
case GTK_TOOLBAR_BOTH_HORIZ:
@ -632,11 +635,14 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
}
gtk_container_add (GTK_CONTAINER (button->priv->button), box);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "text-button");
break;
case GTK_TOOLBAR_TEXT:
gtk_container_add (GTK_CONTAINER (button->priv->button), label);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "text-button");
gtk_style_context_remove_class (gtk_widget_get_style_context (button->priv->button), "image-button");
break;
}