summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Müllner <fmuellner@gnome.org>2014-06-07 11:03:01 +0200
committerFlorian Müllner <fmuellner@gnome.org>2014-06-10 13:40:33 +0200
commitaf3aae729583de917e7961123a6e8714acdcdf25 (patch)
tree4af2ef13c2ad476ddd9a2cbfb82205ac4dcbc848
parent98e219da4b8d18be05cd9346ed96c6a86962e801 (diff)
downloadmutter-af3aae729583de917e7961123a6e8714acdcdf25.tar.gz
meta-window-actor: Don't add shadows to popups if the toolkit already does
GTK+ will add its own shadows client-side, so we don't need to anymore. https://bugzilla.gnome.org/show_bug.cgi?id=731353
-rw-r--r--src/compositor/meta-window-actor.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 5bc650fe8..f9128443e 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -746,9 +746,11 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
return FALSE;
/*
- * Add shadows to override redirect windows (e.g., Gtk menus).
+ * Add shadows to override redirect windows on X11 unless the toolkit
+ * indicates that it is handling shadows itself (e.g., Gtk menus).
*/
- if (priv->window->override_redirect)
+ if (priv->window->override_redirect &&
+ !priv->window->has_custom_frame_extents)
return TRUE;
return FALSE;