use actions to focus and raise the wnidow ni client_activate. this means the focus...

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 7b96928944434bb54246e036adc3f93ecd0af931..725416bb922d4a59e14e576f2b4a49375d245199 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1664,7 +1664,9 @@ static ObStackingLayer calc_layer(ObClient *self)
 {
     ObStackingLayer l;
 
-    if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN;
+    if (self->fullscreen &&
+        (client_focused(self) || client_search_focus_tree(self)))
+        l = OB_STACKING_LAYER_FULLSCREEN;
     else if (self->type == OB_CLIENT_TYPE_DESKTOP)
         l = OB_STACKING_LAYER_DESKTOP;
     else if (self->type == OB_CLIENT_TYPE_DOCK) {
@@ -2181,7 +2183,7 @@ void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea)
             }
         }
         if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */
-            if (self->pre_max_area.width > 0) {
+            if (self->pre_max_area.height > 0) {
                 y = self->pre_max_area.y;
                 h = self->pre_max_area.height;
 
@@ -2613,8 +2615,8 @@ void client_activate(ObClient *self, gboolean here)
         return;
     if (self->shaded)
         client_shade(self, FALSE);
-    client_focus(self);
-    stacking_raise(CLIENT_AS_WINDOW(self));
+    action_run_string("Focus", self);
+    action_run_string("Raise", self);
 }
 
 gboolean client_focused(ObClient *self)