[Xfce4-commits] [xfce/xfwm4] 01/03: Fix WM_SIZE_HINTS regression

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 46b7cfdcc1aa6126691d0443d0055234ab4c708e
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Nov 6 09:06:27 2015 +0100

    Fix WM_SIZE_HINTS regression
    
    Bug: 12176
    
    If, upon mapping, WM_SIZE_HINTS specifies a non-resizable window, xfwm4
    ignores all subsequent updates to WM_SIZE_HINTS set by the application.
    
    This is a regression introduced by commit 78b5c3c (bug 10910).
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/client.c |    4 ----
 src/client.h |    5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/client.c b/src/client.c
index f0538a2..553140d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1215,10 +1215,6 @@ clientGetWMNormalHints (Client *c, gboolean update)
     {
         FLAG_SET (c->xfwm_flags, XFWM_FLAG_IS_RESIZABLE);
     }
-    else
-    {
-        FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_HAS_MAXIMIZE | XFWM_FLAG_HAS_RESIZE);
-    }
 
     if (update)
     {
diff --git a/src/client.h b/src/client.h
index 2687033..8b2080e 100644
--- a/src/client.h
+++ b/src/client.h
@@ -223,9 +223,8 @@
 #define CLIENT_CAN_HIDE_WINDOW(c)       (!(c->transient_for) && \
                                          FLAG_TEST(c->xfwm_flags, XFWM_FLAG_HAS_HIDE) && \
                                          !FLAG_TEST(c->flags, CLIENT_FLAG_SKIP_TASKBAR))
-#define CLIENT_CAN_MAXIMIZE_WINDOW(c)   (FLAG_TEST(c->xfwm_flags, XFWM_FLAG_HAS_MAXIMIZE | \
-                                                                  XFWM_FLAG_HAS_RESIZE | \
-                                                                  XFWM_FLAG_IS_RESIZABLE) && \
+#define CLIENT_CAN_MAXIMIZE_WINDOW(c)   (FLAG_TEST_ALL(c->xfwm_flags, XFWM_FLAG_HAS_MAXIMIZE | \
+                                                                      XFWM_FLAG_IS_RESIZABLE) && \
                                          !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
 #define CLIENT_CAN_FILL_WINDOW(c)       (FLAG_TEST(c->xfwm_flags, XFWM_FLAG_HAS_RESIZE | \
                                                                   XFWM_FLAG_IS_RESIZABLE) && \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.