[Xfce4-commits] <xfwm4:master> Improve horizontal/vertical maximization toggle so that de-maximizing in either direction while fully maximized gives the expected maximization result.

[Olivier Fourdan]

Updating branch refs/heads/master
         to 957f5247116f3cd683d99ad1e8eab774779b364a (commit)
       from c5333fd855fc2296843343a56cf8309ddca836fc (commit)

commit 957f5247116f3cd683d99ad1e8eab774779b364a
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Oct 21 08:45:12 2011 +0200

    Improve horizontal/vertical maximization toggle so that de-maximizing in either direction while fully maximized gives the expected maximization result.

 src/client.c |   48 +++++++++++++++++++-----------------------------
 1 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/src/client.c b/src/client.c
index 3a9218f..05e28d3 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3022,30 +3022,17 @@ clientRemoveMaximizeFlag (Client * c)
 static void
 clientNewMaxState (Client * c, XWindowChanges *wc, int mode)
 {
-    /*
-     * We treat differently full maximization from vertical or horizontal maximization.
-     * This is for usability concerns, otherwise maximization acts like a toggle,
-     * switching from horizontal to vertical instead of switching to full maximization.
-     *
-     * The full size is not computed yet, as full maximization removes borders
-     * while either horizontal or vertical maximization still shows decorations...
-     */
-
-    if ((mode & CLIENT_FLAG_MAXIMIZED) == CLIENT_FLAG_MAXIMIZED)
-    {
-        if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED))
-        {
-            FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED);
-            return;
-        }
-    }
-
     if (mode & CLIENT_FLAG_MAXIMIZED_HORIZ)
     {
         if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ))
         {
             FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ);
-            return;
+        }
+        else
+        {
+            FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ);
+            wc->x = c->old_x;
+            wc->width = c->old_width;
         }
     }
 
@@ -3054,15 +3041,14 @@ clientNewMaxState (Client * c, XWindowChanges *wc, int mode)
         if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT))
         {
             FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_VERT);
-            return;
+        }
+        else
+        {
+            FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED_VERT);
+            wc->y = c->old_y;
+            wc->height = c->old_height;
         }
     }
-
-    FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED);
-    wc->x = c->old_x;
-    wc->y = c->old_y;
-    wc->width = c->old_width;
-    wc->height = c->old_height;
 }
 
 static void
@@ -3150,14 +3136,18 @@ clientToggleMaximized (Client * c, int mode, gboolean restore_position)
     wc.width = c->width;
     wc.height = c->height;
 
-    if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED) && (restore_position))
+    if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT) && (restore_position))
     {
-        c->old_x = c->x;
         c->old_y = c->y;
-        c->old_width = c->width;
         c->old_height = c->height;
     }
 
+    if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ) && (restore_position))
+    {
+        c->old_x = c->x;
+        c->old_width = c->width;
+    }
+
     /* 1) Compute the new state */
     clientNewMaxState (c, &wc, mode);