[gtk+] menuitem: Simplify separators
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] menuitem: Simplify separators
- Date: Tue, 22 Dec 2015 15:31:45 +0000 (UTC)
commit 164e8ed6bd4c37e9a88e26bc5731eeaf2918a652
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Dec 22 10:30:51 2015 -0500
menuitem: Simplify separators
For regular separators, we just rely on standard CSS background
rendering nowadays. Do the same for separators in menus.
https://bugzilla.gnome.org/show_bug.cgi?id=759765
gtk/gtkmenuitem.c | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 991581a..a23c25d 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -290,36 +290,12 @@ gtk_menu_item_render (GtkCssGadget *gadget,
GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
GtkMenuItemPrivate *priv = menu_item->priv;
- GtkStyleContext *context;
- GtkWidget *child, *parent;
-
- context = gtk_widget_get_style_context (widget);
+ GtkWidget *parent;
- child = gtk_bin_get_child (GTK_BIN (menu_item));
parent = gtk_widget_get_parent (widget);
if (priv->submenu && !GTK_IS_MENU_BAR (parent))
- {
- gtk_css_gadget_draw (priv->arrow_gadget, cr);
- }
- else if (!child)
- {
- gboolean wide_separators;
- gint separator_height;
-
- gtk_widget_style_get (widget,
- "wide-separators", &wide_separators,
- "separator-height", &separator_height,
- NULL);
- if (wide_separators)
- gtk_render_frame (context, cr,
- x, y,
- width, separator_height);
- else
- gtk_render_line (context, cr,
- x, y,
- width, y);
- }
+ gtk_css_gadget_draw (priv->arrow_gadget, cr);
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]