From 5f2371a47d375236e1a7b5fb9a93bcec4367692d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Thu, 12 Jan 2012 19:01:43 +0100 Subject: [PATCH] Don't listen to repetitive motif hints regarding the window border and prefer rules over them anyway BUG: 291312 REVIEW: 103681 FIXED-IN: 4.8 --- client.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client.cpp b/client.cpp index 8c00249884..520ed858c0 100644 --- a/client.cpp +++ b/client.cpp @@ -1984,15 +1984,15 @@ void Client::getMotifHints() { bool mgot_noborder, mnoborder, mresize, mmove, mminimize, mmaximize, mclose; Motif::readFlags(client, mgot_noborder, mnoborder, mresize, mmove, mminimize, mmaximize, mclose); - if (mgot_noborder) { + if (mgot_noborder && motif_noborder != mnoborder) { motif_noborder = mnoborder; // If we just got a hint telling us to hide decorations, we do so. if (motif_noborder) - noborder = true; + noborder = rules()->checkNoBorder(true); // If the Motif hint is now telling us to show decorations, we only do so if the app didn't // instruct us to hide decorations in some other way, though. - else if (!motif_noborder && !app_noborder) - noborder = false; + else if (!app_noborder) + noborder = rules()->checkNoBorder(false); } if (!hasNETSupport()) { // NETWM apps should set type and size constraints