this fixes pypanel.. heh.

[chaz/openbox] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 564b995e2d8f292bc6bd26fb6802bb96ac552b9c..66aeebcf4c17f9346b2eae2694e004681abbbfac 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -426,7 +426,7 @@ void stacking_add_nonintrusive(ObWindow *win)
         }
     }
     if (!it_below) {
-        if (client == focus_client) {
+        if (client_search_transient(client, focus_client)) {
             /* it's focused so put it at the top */
             stacking_list = g_list_append(stacking_list, win);
             stacking_raise(win);
@@ -530,7 +530,7 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
                         occludes = TRUE;
                         break;
                     }
-                    else if (c->layer > client->layer)
+                    else if (c->layer < client->layer)
                         break; /* we past its layer */
                 }
             }
@@ -562,7 +562,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
     case Above:
         ob_debug("Restack request Above for client %s sibling %s\n",
                  client->title, sibling ? sibling->title : "(all)");
-        if (activate)
+        if (activate && !client->iconic)
             /* use user=TRUE because it is impossible to get a timestamp
                for this */
             client_activate(client, FALSE, TRUE);
@@ -573,7 +573,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
         ob_debug("Restack request TopIf for client %s sibling %s\n",
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
-            if (activate)
+            if (activate && !client->iconic)
                 /* use user=TRUE because it is impossible to get a timestamp
                    for this */
                 client_activate(client, FALSE, TRUE);
@@ -586,7 +586,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
                  "%s\n",
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
-            if (activate)
+            if (activate && !client->iconic)
                 /* use user=TRUE because it is impossible to get a timestamp
                    for this */
                 client_activate(client, FALSE, TRUE);