M openbox/client.c → openbox/client.c

@@ -2343,12 +2343,9 @@ (self->frame->size.right == 0 && self->frame->size.left == 0 &&
                 self->frame->size.bottom == 0 && self->frame->size.top == 0 &&
                 RECT_EQUAL(self->area,
                            *screen_physical_area_monitor
-                           (client_monitor(self))))))) {
-        if (client_focused(self) || client_search_focus_tree(self))
-            l = OB_STACKING_LAYER_FULLSCREEN;
-        else
-            l = OB_STACKING_LAYER_FULLSCREEN_BELOW;
-    }
+                           (client_monitor(self)))))) &&
+             (client_focused(self) || client_search_focus_tree(self)))
+        l = OB_STACKING_LAYER_FULLSCREEN;
     else if (self->above) l = OB_STACKING_LAYER_ABOVE;
     else if (self->below) l = OB_STACKING_LAYER_BELOW;
     else l = OB_STACKING_LAYER_NORMAL;

M openbox/stacking.h → openbox/stacking.h

@@ -29,12 +29,11 @@ /*! The possible stacking layers a client window can be a part of */
 typedef enum {
     OB_STACKING_LAYER_INVALID,
     OB_STACKING_LAYER_DESKTOP,          /*!< 0 - desktop windows */
-    OB_STACKING_LAYER_FULLSCREEN_BELOW, /*!< 1 - unfocused fullscreens */
-    OB_STACKING_LAYER_BELOW,            /*!< 2 - normal windows w/ below */
-    OB_STACKING_LAYER_NORMAL,           /*!< 3 - normal windows */
-    OB_STACKING_LAYER_ABOVE,            /*!< 4 - normal windows w/ above */
-    OB_STACKING_LAYER_FULLSCREEN,       /*!< 5 - fullscreeen windows */
-    OB_STACKING_LAYER_INTERNAL,         /*!< 6 - openbox windows/menus */
+    OB_STACKING_LAYER_BELOW,            /*!< 1 - normal windows w/ below */
+    OB_STACKING_LAYER_NORMAL,           /*!< 2 - normal windows */
+    OB_STACKING_LAYER_ABOVE,            /*!< 3 - normal windows w/ above */
+    OB_STACKING_LAYER_FULLSCREEN,       /*!< 4 - fullscreeen windows */
+    OB_STACKING_LAYER_INTERNAL,         /*!< 5 - openbox windows/menus */
     OB_NUM_STACKING_LAYERS
 } ObStackingLayer;