mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-10-02 12:07:29 +00:00
menuitem: Don't set menubar style class randomly
a) We're not a menubar, you can match on the parent if you have to b) It's not set while getting preferred sizes
This commit is contained in:
parent
1d54e4e867
commit
d8b99d47ea
@ -1602,13 +1602,8 @@ gtk_menu_item_draw (GtkWidget *widget,
|
|||||||
child = gtk_bin_get_child (GTK_BIN (menu_item));
|
child = gtk_bin_get_child (GTK_BIN (menu_item));
|
||||||
parent = gtk_widget_get_parent (widget);
|
parent = gtk_widget_get_parent (widget);
|
||||||
|
|
||||||
gtk_style_context_save (context);
|
|
||||||
|
|
||||||
gtk_style_context_get_padding (context, state, &padding);
|
gtk_style_context_get_padding (context, state, &padding);
|
||||||
|
|
||||||
if (GTK_IS_MENU_BAR (parent))
|
|
||||||
gtk_style_context_add_class (context, GTK_STYLE_CLASS_MENUBAR);
|
|
||||||
|
|
||||||
if (child && (state & GTK_STATE_FLAG_PRELIGHT))
|
if (child && (state & GTK_STATE_FLAG_PRELIGHT))
|
||||||
{
|
{
|
||||||
gtk_render_background (context, cr, x, y, w, h);
|
gtk_render_background (context, cr, x, y, w, h);
|
||||||
@ -1673,8 +1668,6 @@ gtk_menu_item_draw (GtkWidget *widget,
|
|||||||
|
|
||||||
GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->draw (widget, cr);
|
GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->draw (widget, cr);
|
||||||
|
|
||||||
gtk_style_context_restore (context);
|
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user