for dock windows, honor both the above and below states, keeping docks above and...

diff --git a/openbox/client.c b/openbox/client.c
index 670e06bbe0f48ee42e4b25d4de2b1b48ac2a1f27..b3ea0082e3248aea83e1005f59a982f572133cff 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1697,7 +1697,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->below) l = OB_STACKING_LAYER_TOP;
+        if (self->above) l = OB_STACKING_LAYER_DOCK_ABOVE;
+        else if (self->below) l = OB_STACKING_LAYER_DOCK_BELOW;
         else l = OB_STACKING_LAYER_NORMAL;
     }
     else if (self->above) l = OB_STACKING_LAYER_ABOVE;