From 9b3afacfed0689ed36c7c10d00ca7873da3d0bb8 Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Thu, 23 May 2019 13:02:29 -0400
Subject: frames: add dest_kind to apply_cairo_region_to_window

upstream commit:
https://gitlab.gnome.org/GNOME/metacity/commit/94c8d620
---
 src/ui/frames.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/frames.c b/src/ui/frames.c
index 1f6723ea..1ea60bbc 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -878,6 +878,7 @@ static void
 apply_cairo_region_to_window (Display        *display,
                               Window          xwindow,
                               cairo_region_t *region,
+                              int             dest_kind,
                               int             op)
 {
   int n_rects, i;
@@ -899,7 +900,7 @@ apply_cairo_region_to_window (Display        *display,
     }
 
   XShapeCombineRectangles (display, xwindow,
-                           ShapeBounding, 0, 0, rects, n_rects,
+                           dest_kind, 0, 0, rects, n_rects,
                            op, YXBanded);
 
   g_free (rects);
@@ -1167,7 +1168,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
       cairo_region_destroy (client_region);
 
       apply_cairo_region_to_window (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), shape_window,
-                                    window_region, ShapeUnion);
+                                    window_region, ShapeBounding, ShapeUnion);
 
       /* Now copy shape_window shape to the real frame */
       XShapeCombineShape (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow, ShapeBounding,
@@ -1187,7 +1188,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
                   frame->xwindow);
 
       apply_cairo_region_to_window (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow,
-                                    window_region, ShapeSet);
+                                    window_region, ShapeBounding, ShapeSet);
     }
 
   frame->shape_applied = TRUE;
-- 
cgit v1.2.1