From 72003d38721ae59d90f12cafb3ebee08ed96ee68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Tue, 20 Jan 2015 05:02:26 +0200 Subject: compositor: fix border_size --- src/compositor/compositor-xrender.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index 03875203..a86e4e84 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -1112,8 +1112,18 @@ border_size (MetaCompWindow *cw) MetaScreen *screen = cw->screen; MetaDisplay *display = meta_screen_get_display (screen); Display *xdisplay = meta_display_get_xdisplay (display); + cairo_region_t *visible_region; + XserverRegion visible = None; XserverRegion border; + if (cw->window) + { + visible_region = meta_window_get_frame_bounds (cw->window); + + if (visible_region) + visible = cairo_region_to_xserver_region (xdisplay, visible_region); + } + meta_error_trap_push (display); border = XFixesCreateRegionFromWindow (xdisplay, cw->id, WindowRegionBounding); @@ -1123,6 +1133,19 @@ border_size (MetaCompWindow *cw) XFixesTranslateRegion (xdisplay, border, cw->attrs.x + cw->attrs.border_width, cw->attrs.y + cw->attrs.border_width); + + if (visible != None) + { + XFixesTranslateRegion (xdisplay, visible, + cw->attrs.x + cw->attrs.border_width, + cw->attrs.y + cw->attrs.border_width); + + XFixesIntersectRegion (xdisplay, visible, visible, border); + XFixesDestroyRegion (xdisplay, border); + + return visible; + } + return border; } -- cgit v1.2.1