From 51e378c8f28b96b94c8da338b1b0f26cbc32c7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 12 May 2017 13:40:31 +0200 Subject: [PATCH] window-actor: Special-case shaped Java windows OpenJDK wrongly assumes that shaping a window implies no shadows. They got lucky until commit b975676c changed the fallback case, but now their compliance tests are broken. Make them happy again by special-casing shaped Java windows. --- src/compositor/meta-window-actor-x11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c index 2781df09cc..8748f3aa3a 100644 --- a/src/compositor/meta-window-actor-x11.c +++ b/src/compositor/meta-window-actor-x11.c @@ -431,6 +431,14 @@ has_shadow (MetaWindowActorX11 *actor_x11) if (priv->has_custom_frame_extents) return FALSE; + /* + * OpenJDK wrongly assumes that shaping a window implies no compositor + * shadows; make its compliance tests happy to give it what it wants ... + */ + if (g_strcmp0 (window->res_name, "sun-awt-X11-XWindowPeer") == 0 && + priv->shape_region != NULL) + return FALSE; + /* * Generate shadows for all other windows. */ -- 2.44.0.501.g19981daefd.dirty