From a711f51629162569b4b69c08599079cc2d637788 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 27 Jan 2009 14:57:37 +0100 Subject: [PATCH] Fix setting of private->shaped when setting input shape I.e. it should only be set/unset when setting ShapeBounding. --- gdk/x11/gdkwindow-x11.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 0557d53936..6e3b788b08 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -3397,7 +3397,9 @@ do_shape_combine_region (GdkWindow *window, ? gdk_display_supports_shapes (GDK_WINDOW_DISPLAY (window)) : gdk_display_supports_input_shapes (GDK_WINDOW_DISPLAY (window))) { - private->shaped = FALSE; + if (shape == ShapeBounding) + private->shaped = FALSE; + if (shape == ShapeBounding) _gdk_x11_window_tmp_unset_parent_bg (window, TRUE); XShapeCombineMask (GDK_WINDOW_XDISPLAY (window), @@ -3419,7 +3421,8 @@ do_shape_combine_region (GdkWindow *window, gint n_rects = 0; XRectangle *xrects = NULL; - private->shaped = shape == ShapeBounding; + if (shape == ShapeBounding) + private->shaped = TRUE; _gdk_region_get_xrectangles (shape_region, 0, 0,