diff options
| author | Victor Kareh <[email protected]> | 2019-05-23 13:02:29 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-16 18:12:44 +0200 |
| commit | 09a20c0e65758a28e712aaabdf41cb2f4503269c (patch) | |
| tree | b09b44209ddd6f6f5928acf2ff50d89ae44f63d1 /src/ui | |
| parent | 5aa10796218606ae93d2fec4692c27d0264c07f9 (diff) | |
| download | marco-09a20c0e65758a28e712aaabdf41cb2f4503269c.tar.bz2 marco-09a20c0e65758a28e712aaabdf41cb2f4503269c.tar.xz | |
frames: add dest_kind to apply_cairo_region_to_window
upstream commit:
https://gitlab.gnome.org/GNOME/metacity/commit/94c8d620
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/frames.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c index ce3e3f5b..c9b0bfb4 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; |