Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1248974 - Remove gtk_style_context_save which corrupts style hierarchy for menu item background, r=karlt

Browse Source
This commit is contained in:
Martin Stransky 2016-05-09 04:17:00 +02:00
parent 7017c6043a
commit baaa0fca1d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/gtk/gtk3drawing.cpp
View File

@ -2535,14 +2535,12 @@ moz_gtk_menu_item_paint(cairo_t *cr, GdkRectangle* rect,
item_widget = gMenuItemWidget;
}
style = gtk_widget_get_style_context(item_widget);
gtk_style_context_save(style);
if (flags & MOZ_TOPLEVEL_MENU_ITEM) {
gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR);
}
gtk_widget_set_direction(item_widget, direction);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUITEM);
gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state));
border_width = gtk_container_get_border_width(GTK_CONTAINER(item_widget));
@ -2554,7 +2552,11 @@ moz_gtk_menu_item_paint(cairo_t *cr, GdkRectangle* rect,
gtk_render_background(style, cr, x, y, w, h);
gtk_render_frame(style, cr, x, y, w, h);
gtk_style_context_restore(style);
if (flags & MOZ_TOPLEVEL_MENU_ITEM) {
gtk_style_context_remove_class(style, GTK_STYLE_CLASS_MENUBAR);
}
gtk_style_context_set_state(style, GTK_STATE_FLAG_NORMAL);
}
return MOZ_GTK_SUCCESS;