Updating branch refs/heads/master to 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit) from 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d (commit)
commit 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 Author: Peter de Ridder <pe...@xfce.org> Date: Sun Feb 19 13:50:28 2012 +0100 Don't use menubar style border for menubar items gtk-3.0/xfce_engine.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index 123977a..ce25dca 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -681,7 +681,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo cairo_stroke(cr); } } - else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) + else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR) && + !gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM)) { if ((xt > 1) && (yt > 1)) { @@ -884,7 +885,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo { /* Do nothing */ } - else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) + else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR) && + !gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM)) { if ((xt > 1) && (yt > 1)) { _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits