summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-23 13:02:29 -0400
committerVictor Kareh <[email protected]>2019-06-05 10:49:37 -0400
commit9b3afacfed0689ed36c7c10d00ca7873da3d0bb8 (patch)
treedbdb1096bb3e98885edf5944da68dfad7e91e7eb
parent12fe28bb1eaa53b8673d7f08c3168f3af7291de8 (diff)
downloadmarco-9b3afacfed0689ed36c7c10d00ca7873da3d0bb8.tar.bz2
marco-9b3afacfed0689ed36c7c10d00ca7873da3d0bb8.tar.xz
frames: add dest_kind to apply_cairo_region_to_window
upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/94c8d620
-rw-r--r--src/ui/frames.c7
1 files changed, 4 insertions, 3 deletions
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;