[marco/f21] fix compositor-xrender: don't add shadows to ARGB

Wolfgang Ulbrich raveit65 at fedoraproject.org
Tue Oct 21 18:29:25 UTC 2014


commit 53056a6395daed40358d243e203705d3037c20dd
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Oct 21 20:29:08 2014 +0200

    fix compositor-xrender: don't add shadows to ARGB

 marco.spec                                         |    9 ++++++++-
 ...ignore-adding-a-window-if-already-present.patch |   16 ----------------
 marco_rendering-with-gtk3.14.patch                 |   17 +++++++++++++++++
 3 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/marco.spec b/marco.spec
index 3553995..1669193 100644
--- a/marco.spec
+++ b/marco.spec
@@ -14,7 +14,7 @@
 
 Name:           marco
 Version:        %{branch}.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 #Release:       0.5%{?git_rel}%{?dist}
 Summary:        MATE Desktop window manager
 License:        LGPLv2+ and GPLv2+
@@ -37,6 +37,8 @@ Source5:        window.png
 Patch0:         marco_add-pixbuf-inline-icons.patch
 # http://git.mate-desktop.org/marco/commit/?h=1.8&id=c2cbcaa
 Patch1:         marco_fix-renaming-in-1.8.2.patch
+#https://github.com/mate-desktop/marco/pull/141
+Patch2:         marco_rendering-with-gtk3.14.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
@@ -87,6 +89,7 @@ cp %{SOURCE5} src/window.png
 
 %patch0 -p1 -b .inline-icons
 %patch1 -p1 -b .fix-renaming
+%patch2 -p1 -b .rendering
 
 # needed for the patch and for git snapshot builds
 autoreconf -if
@@ -166,6 +169,10 @@ fi
 
 
 %changelog
+* Tue Oct 21 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-3
+-fix rendering issue
+- https://github.com/mate-desktop/marco/pull/141
+
 * Fri Oct 03 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-2
 - fix to fix a release, LOL
 
diff --git a/marco_rendering-with-gtk3.14.patch b/marco_rendering-with-gtk3.14.patch
new file mode 100644
index 0000000..bc3c4e0
--- /dev/null
+++ b/marco_rendering-with-gtk3.14.patch
@@ -0,0 +1,17 @@
+diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
+index dbd7bd9..9bf9d8d 100644
+--- a/src/compositor/compositor-xrender.c
++++ b/src/compositor/compositor-xrender.c
+@@ -911,6 +911,12 @@ window_has_shadow (MetaCompWindow *cw)
+       }
+     }
+ 
++  /* Do not add shadows to ARGB windows */
++  if (cw->mode == WINDOW_ARGB) {
++    meta_verbose ("Window has no shadow as it is ARGB\n");
++    return FALSE;
++  }
++
+   /* Never put a shadow around shaped windows */
+   if (cw->shaped) {
+     meta_verbose ("Window has no shadow as it is shaped\n");


More information about the scm-commits mailing list