diff options
| -rw-r--r-- | openbox/client.c | 9 | ||||
| -rw-r--r-- | openbox/stacking.h | 11 |
2 files changed, 8 insertions, 12 deletions
diff --git a/openbox/client.c b/openbox/client.c index e7711692..e51ad65e 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -2343,12 +2343,9 @@ static ObStackingLayer calc_layer(ObClient *self) 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; diff --git a/openbox/stacking.h b/openbox/stacking.h index ea1ea8c9..d93341c8 100644 --- a/openbox/stacking.h +++ b/openbox/stacking.h @@ -29,12 +29,11 @@ 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; |