rpms
/
mutter
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust downstream patch

This commit is contained in:
Florian Müllner 2019-12-11 19:21:11 +01:00
parent 0e5fce97f5
commit c6091e7fed
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0001-window-actor-Special-case-shaped-Java-windows.patch
View File

@ -1,4 +1,4 @@
From 172180057f37946461866e397d01b72c3e29c887 Mon Sep 17 00:00:00 2001 From 9efcc35102b4c41265e93461b35a1193b3d5822d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 12 May 2017 13:40:31 +0200 Date: Fri, 12 May 2017 13:40:31 +0200
Subject: [PATCH] window-actor: Special-case shaped Java windows Subject: [PATCH] window-actor: Special-case shaped Java windows
@ -8,28 +8,28 @@ They got lucky until commit b975676c changed the fallback case,
but now their compliance tests are broken. Make them happy again but now their compliance tests are broken. Make them happy again
by special-casing shaped Java windows. by special-casing shaped Java windows.
--- ---
src/compositor/meta-window-actor.c | 8 ++++++++ src/compositor/meta-window-actor-x11.c | 8 ++++++++
1 file changed, 8 insertions(+) 1 file changed, 8 insertions(+)
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c
index 219226b19..58a03b1fe 100644 index b7032e0ba..b05d5e158 100644
--- a/src/compositor/meta-window-actor.c --- a/src/compositor/meta-window-actor-x11.c
+++ b/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor-x11.c
@@ -858,6 +858,14 @@ meta_window_actor_has_shadow (MetaWindowActor *self) @@ -528,6 +528,14 @@ has_shadow (MetaWindowActorX11 *actor_x11)
if (priv->window->has_custom_frame_extents) */
if (window->has_custom_frame_extents)
return FALSE; return FALSE;
+
+ /* + /*
+ * OpenJDK wrongly assumes that shaping a window implies no compositor + * OpenJDK wrongly assumes that shaping a window implies no compositor
+ * shadows; make its compliance tests happy to give it what it wants ... + * shadows; make its compliance tests happy to give it what it wants ...
+ */ + */
+ if (g_strcmp0 (priv->window->res_name, "sun-awt-X11-XWindowPeer") == 0 && + if (g_strcmp0 (window->res_name, "sun-awt-X11-XWindowPeer") == 0 &&
+ priv->window->shape_region != NULL) + window->shape_region != NULL)
+ return FALSE; + return FALSE;
+
/* /*
* Generate shadows for all other windows. * Generate shadows for all other windows.
*/
-- --
2.19.1 2.23.0