From d6d86d75267c20bd2ade01b80e0d82c346eadd53 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Mon, 2 Jan 2006 21:44:20 +0000
Subject: [PATCH] Redo differently.

(Old svn revision: 19277)
---
 src/placement.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/placement.c b/src/placement.c
index 92578cada..effdbb8cf 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -506,12 +506,21 @@ clientKeepVisible (Client * c)
 static void
 clientAutoMaximize (Client * c, int full_w, int full_h)
 {
-    if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ) && (frameWidth (c) > full_w))
+    if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN) || 
+        FLAG_TEST (c->xfwm_flags, XFWM_FLAG_LEGACY_FULLSCREEN))
+    {
+        /* Fullscree nwindows should not be maximized */
+        return;
+    }
+
+    if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ) && 
+        (frameWidth (c) > full_w))
     {
         FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ);
     }
 
-    if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT) && (frameHeight (c) > full_h))
+    if (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT) && 
+        (frameHeight (c) > full_h))
     {
         FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_VERT);
     }
@@ -683,9 +692,5 @@ clientInitPosition (Client * c)
         }
     }
 
-    if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN) && 
-        !FLAG_TEST (c->xfwm_flags, XFWM_FLAG_LEGACY_FULLSCREEN))
-    {
-        clientAutoMaximize (c, full_w, full_h);
-    }
+    clientAutoMaximize (c, full_w, full_h);
 }
-- 
GitLab