Revert "Optionally remove frame on tiling as well"

This reverts commit 6f6604a338e24a1df45d0cb97c2c0ec5cd205b62.

3 files changed, 11 insertions, 11 deletions

diff --git a/src/client.c b/src/client.c
index 7c93414..79de331 100644
--- a/src/client.c
+++ b/src/client.c
@@ -843,7 +843,7 @@ clientMoveResizeWindow (Client *c, XWindowChanges * wc, unsigned long mask)
         mask &= ~(CWSibling | CWStackMode);
     }
     if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-        || (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        || (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
             && (screen_info->params->borderless_maximize)))
     {
         /* Not allowed in fullscreen or maximzed mode */
diff --git a/src/frame.c b/src/frame.c
index 141280f..ec489f6 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -89,7 +89,7 @@ frameLeft (Client * c)
     g_return_val_if_fail (c != NULL, 0);
     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
         && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-        && (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
             || !(c->screen_info->params->borderless_maximize)))
     {
         return c->screen_info->sides[SIDE_LEFT][ACTIVE].width;
@@ -105,7 +105,7 @@ frameRight (Client * c)
     g_return_val_if_fail (c != NULL, 0);
     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
         && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-        && (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
             || !(c->screen_info->params->borderless_maximize)))
     {
         return c->screen_info->sides[SIDE_RIGHT][ACTIVE].width;
@@ -134,7 +134,7 @@ frameBottom (Client * c)
     g_return_val_if_fail (c != NULL, 0);
     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
         && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-        && (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
             || !(c->screen_info->params->borderless_maximize)))
     {
         return c->screen_info->sides[SIDE_BOTTOM][ACTIVE].height;
@@ -150,7 +150,7 @@ frameX (Client * c)
     g_return_val_if_fail (c != NULL, 0);
     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
         && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-        && (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
             || !(c->screen_info->params->borderless_maximize)))
     {
         return c->x - frameLeft (c);
@@ -180,7 +180,7 @@ frameWidth (Client * c)
     g_return_val_if_fail (c != NULL, 0);
     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
         && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-        && (!FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
             || !(c->screen_info->params->borderless_maximize)))
     {
         return c->width + frameLeft (c) + frameRight (c);
@@ -320,7 +320,7 @@ frameTopLeftWidth (Client * c, int state)
     TRACE ("entering frameTopLeftWidth");
 
     g_return_val_if_fail (c != NULL, 0);
-    if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+    if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
         && c->screen_info->params->borderless_maximize)
     {
         return 0;
@@ -335,7 +335,7 @@ frameTopRightWidth (Client * c, int state)
     TRACE ("entering frameTopRightWidth");
 
     g_return_val_if_fail (c != NULL, 0);
-    if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+    if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
         && c->screen_info->params->borderless_maximize)
     {
         return 0;
@@ -349,7 +349,7 @@ frameButtonOffset (Client *c)
     TRACE ("entering frameButtonOffset");
 
     g_return_val_if_fail (c != NULL, 0);
-    if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+    if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
         && c->screen_info->params->borderless_maximize)
     {
         return MAX (0, c->screen_info->params->maximized_offset);
@@ -1180,7 +1180,7 @@ frameDrawWin (Client * c)
                 &screen_info->corners[CORNER_BOTTOM_RIGHT][state]);
         }
 
-        if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
             && (c->screen_info->params->borderless_maximize))
         {
             xfwmWindowHide (&c->sides[SIDE_LEFT]);
diff --git a/src/moveresize.c b/src/moveresize.c
index e9c53d9..fdc4c11 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -97,7 +97,7 @@ clientSetSize (Client * c, int *size, int base, int min, int max, int incr, gboo
 
     /* Bypass resize increment and max sizes for fullscreen */
     if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-        && !(FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+        && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
              && (c->screen_info->params->borderless_maximize)))
     {