bump the version to 992

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 5c180024277a7d2a08f69595b91e782da47c3efa..2a41ab8da41be0d15fa1743bc8e789a54c5b7239 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1619,15 +1619,17 @@ void client_setup_decor_and_functions(ObClient *self)
         break;
 
     case OB_CLIENT_TYPE_DIALOG:
+    case OB_CLIENT_TYPE_UTILITY:
         /* these windows don't have anything added or removed by default */
         break;
 
-    case OB_CLIENT_TYPE_UTILITY:
     case OB_CLIENT_TYPE_MENU:
     case OB_CLIENT_TYPE_TOOLBAR:
-        /* these windows can't iconify */
-        self->decorations &= ~OB_FRAME_DECOR_ICONIFY;
-        self->functions &= ~OB_CLIENT_FUNC_ICONIFY;
+        /* these windows can't iconify or maximize */
+        self->decorations &= ~(OB_FRAME_DECOR_ICONIFY |
+                               OB_FRAME_DECOR_MAXIMIZE);
+        self->functions &= ~(OB_CLIENT_FUNC_ICONIFY |
+                             OB_CLIENT_FUNC_MAXIMIZE);
         break;
 
     case OB_CLIENT_TYPE_SPLASH:
@@ -2366,10 +2368,10 @@ static ObStackingLayer calc_layer(ObClient *self)
     }
     else if ((self->fullscreen ||
               /* No decorations and fills the monitor = oldskool fullscreen.
-                 But not for undecorated windows, because the user can do that
+                 But not for maximized windows.
               */
               (self->decorations == 0 &&
-               !self->undecorated &&
+               !(self->max_horz && self->max_vert) &&
                RECT_EQUAL(self->area,
                           *screen_physical_area_monitor
                           (client_monitor(self))))) &&