summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-22 07:55:57 -0400
committerraveit65 <[email protected]>2019-06-16 18:12:44 +0200
commit54b4bd0e2ab7014f5c8acc0336aa6a5a420d3c37 (patch)
tree12ff68c3056d3743516ea2f3d362f6844af92664
parent940afededd6caab7c977a43f202457c10129aec2 (diff)
downloadmarco-54b4bd0e2ab7014f5c8acc0336aa6a5a420d3c37.tar.bz2
marco-54b4bd0e2ab7014f5c8acc0336aa6a5a420d3c37.tar.xz
Fix XShape
Commit https://gitlab.gnome.org/GNOME/metacity/commit/c3a04bf unintentionally broke XShape handling. By studying the code extremely carefully, I found this inconsistency with the code that was there before. https://bugzilla.gnome.org/show_bug.cgi?id=635268 upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/2b1c6443
-rw-r--r--src/ui/frames.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c
index bab2f6d0..dfeff3e5 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -833,7 +833,7 @@ apply_cairo_region_to_window (Display *display,
XShapeCombineRectangles (display, xwindow,
ShapeBounding, 0, 0, rects, n_rects,
- ShapeSet, YXBanded);
+ op, YXBanded);
g_free (rects);
}