honor rule when updating deco presence for reshape

CCBUG: 301909
REVIEW: 105485
This commit is contained in:
Thomas Lübking 2012-07-08 22:29:39 +02:00
parent 830c17eebb
commit bc24400010

View file

@ -815,7 +815,7 @@ void Client::updateShape()
if (!app_noborder) { if (!app_noborder) {
// Only when shape is detected for the first time, still let the user to override // Only when shape is detected for the first time, still let the user to override
app_noborder = true; app_noborder = true;
noborder = true; noborder = rules()->checkNoBorder(true);
updateDecoration(true); updateDecoration(true);
} }
if (noBorder()) if (noBorder())
@ -824,7 +824,7 @@ void Client::updateShape()
} else if (app_noborder) { } else if (app_noborder) {
XShapeCombineMask(display(), frameId(), ShapeBounding, 0, 0, None, ShapeSet); XShapeCombineMask(display(), frameId(), ShapeBounding, 0, 0, None, ShapeSet);
detectNoBorder(); detectNoBorder();
app_noborder = noborder; app_noborder = noborder = rules()->checkNoBorder(noborder);
updateDecoration(true); updateDecoration(true);
} }