nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert a commit xor made in 2003 that always annoyed me, now docks (panels) go in the same layers as normal windows again. docks that dont specify layer go in the ABOVE layer and those that specify BELOW get put in the NORMAL layer.

Browse source
This commit is contained in:
Mikael Magnusson 2005-02-06 16:00:24 +00:00
parent ac416fd27e
commit e74fbdaa0e
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
openbox/client.c
View file

@ -1795,9 +1795,8 @@ static ObStackingLayer calc_layer(ObClient *self)
else if (self->type == OB_CLIENT_TYPE_DESKTOP)
l = OB_STACKING_LAYER_DESKTOP;
else if (self->type == OB_CLIENT_TYPE_DOCK) {
if (self->above) l = OB_STACKING_LAYER_DOCK_ABOVE;
else if (self->below) l = OB_STACKING_LAYER_DOCK_BELOW;
else l = OB_STACKING_LAYER_DOCK_NORMAL;
if (self->below) l = OB_STACKING_LAYER_NORMAL;
else l = OB_STACKING_LAYER_ABOVE;
}
else if (self->above) l = OB_STACKING_LAYER_ABOVE;
else if (self->below) l = OB_STACKING_LAYER_BELOW;

8
openbox/config.c
View file

@ -364,11 +364,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
if ((n = parse_find_node("stacking", node))) {
if (parse_contains("top", doc, n))
config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
config_dock_layer = OB_STACKING_LAYER_ABOVE;
else if (parse_contains("normal", doc, n))
config_dock_layer = OB_STACKING_LAYER_DOCK_NORMAL;
config_dock_layer = OB_STACKING_LAYER_NORMAL;
else if (parse_contains("bottom", doc, n))
config_dock_layer = OB_STACKING_LAYER_DOCK_BELOW;
config_dock_layer = OB_STACKING_LAYER_BELOW;
}
if ((n = parse_find_node("direction", node))) {
if (parse_contains("horizontal", doc, n))
@ -568,7 +568,7 @@ void config_startup(ObParseInst *i)
parse_register(i, "resize", parse_resize, NULL);
config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
config_dock_layer = OB_STACKING_LAYER_ABOVE;
config_dock_pos = OB_DIRECTION_NORTHEAST;
config_dock_floating = FALSE;
config_dock_x = 0;

13
openbox/stacking.h
View file

@ -27,14 +27,11 @@
/*! The possible stacking layers a client window can be a part of */
typedef enum {
OB_STACKING_LAYER_DESKTOP, /*!< 0 - desktop windows */
OB_STACKING_LAYER_DOCK_BELOW, /*!< 1 - dock windows set to below */
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_DOCK_NORMAL, /*!< 5 - dock windows set to on top */
OB_STACKING_LAYER_DOCK_ABOVE, /*!< 6 - dock windows set to on top */
OB_STACKING_LAYER_FULLSCREEN, /*!< 7 - fullscreeen windows */
OB_STACKING_LAYER_INTERNAL, /*!< 8 - 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;