[GTK3] Draw menuitem background even when not in hover

This commit is contained in:
trav90 2018-04-05 15:46:38 -05:00 committed by Roy Tam
commit 381de05df3

View file

@ -1826,35 +1826,31 @@ moz_gtk_menu_item_paint(WidgetNodeType widget, cairo_t *cr, GdkRectangle* rect,
{
gint x, y, w, h;
if (state->inHover && !state->disabled) {
GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
GtkStyleContext* style =
ClaimStyleContext(widget, direction, state_flags);
GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
GtkStyleContext* style = ClaimStyleContext(widget, direction, state_flags);
bool pre_3_6 = gtk_check_version(3, 6, 0) != nullptr;
if (pre_3_6) {
// GTK+ 3.4 saves the style context and adds the menubar class to
// menubar children, but does each of these only when drawing, not
// during layout.
gtk_style_context_save(style);
if (widget == MOZ_GTK_MENUBARITEM) {
gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR);
}
bool pre_3_6 = gtk_check_version(3, 6, 0) != nullptr;
if (pre_3_6) {
// GTK+ 3.4 saves the style context and adds the menubar class to
// menubar children, but does each of these only when drawing, not
// during layout.
gtk_style_context_save(style);
if (widget == MOZ_GTK_MENUBARITEM) {
gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR);
}
x = rect->x;
y = rect->y;
w = rect->width;
h = rect->height;
x = rect->x;
y = rect->y;
w = rect->width;
h = rect->height;
gtk_render_background(style, cr, x, y, w, h);
gtk_render_frame(style, cr, x, y, w, h);
gtk_render_background(style, cr, x, y, w, h);
gtk_render_frame(style, cr, x, y, w, h);
if (pre_3_6) {
gtk_style_context_restore(style);
}
ReleaseStyleContext(style);
if (pre_3_6) {
gtk_style_context_restore(style);
}
ReleaseStyleContext(style);
return MOZ_GTK_SUCCESS;
}