From 62b277ad9f543e955e82d81a6065327101bc4bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Thu, 30 Jan 2014 16:28:55 +0100
Subject: [PATCH] depend noborder on motif_noborder after reshape

app_noborder shall be the determined noborder (shape, type)
but relevant noborder shall be determined by rules and respect the
motif hint

BUG: 330573
FIXED-IN: 4.11.6
REVIEW: 115402
---
 client.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client.cpp b/client.cpp
index b576353ac7..fa52aceefb 100644
--- a/client.cpp
+++ b/client.cpp
@@ -718,7 +718,8 @@ void Client::updateShape()
     } else if (app_noborder) {
         xcb_shape_mask(connection(), XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, frameId(), 0, 0, XCB_PIXMAP_NONE);
         detectNoBorder();
-        app_noborder = noborder = rules()->checkNoBorder(noborder);
+        app_noborder = noborder;
+        noborder = rules()->checkNoBorder(noborder || motif_noborder);
         updateDecoration(true);
     }