set teh dock sizes before the app uses it for positioning

[chaz/openbox] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index eac4025cfb9b089b24cddc574fa28729a84add78..d611246977f40fd837fcb30d4292a64c6b11182b 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -112,6 +112,7 @@ void stacking_raise(ObWindow *window)
 
     if (WINDOW_IS_CLIENT(window)) {
         Client *client = WINDOW_AS_CLIENT(window);
+
         /* move up the transient chain as far as possible first */
         if (client->transient_for) {
             if (client->transient_for != TRAN_GROUP) {
@@ -119,17 +120,18 @@ void stacking_raise(ObWindow *window)
                 return;
             } else {
                 GSList *it;
+                gboolean raised = FALSE;
 
-                /* the check for TRAN_GROUP is to prevent an infinate loop with
-                   2 transients of the same group at the head of the group's
-                   members list */
                 for (it = client->group->members; it; it = it->next) {
                     Client *c = it->data;
 
-                    if (c != client && c->transient_for != TRAN_GROUP)
+                    /* checking transient_for prevents infinate loops! */
+                    if (c != client && !c->transient_for) {
                         stacking_raise(it->data);
+                        raised = TRUE;
+                    }
                 }
-                if (it == NULL) return;
+                if (raised) return;
             }
         }
     }
@@ -183,13 +185,11 @@ void stacking_lower(ObWindow *window)
             } else {
                 GSList *it;
 
-                /* the check for TRAN_GROUP is to prevent an infinate loop with
-                   2 transients of the same group at the head of the group's
-                   members list */
                 for (it = client->group->members; it; it = it->next) {
                     Client *c = it->data;
 
-                    if (c != client && c->transient_for != TRAN_GROUP)
+                    /* checking transient_for prevents infinate loops! */
+                    if (c != client && !c->transient_for)
                         stacking_lower(it->data);
                 }
                 if (it == NULL) return;
@@ -228,15 +228,12 @@ void stacking_add_nonintrusive(ObWindow *win)
                 GSList *sit;
                 GList *it;
 
-                /* the check for TRAN_GROUP is to prevent an infinate loop with
-                   2 transients of the same group at the head of the group's
-                   members list */
                 for (it = stacking_list; !parent && it; it = it->next) {
                     for (sit = client->group->members; !parent && sit;
                          sit = sit->next) {
                         Client *c = sit->data;
-                        if (sit->data == it->data &&
-                            c->transient_for != TRAN_GROUP)
+                        /* checking transient_for prevents infinate loops! */
+                        if (sit->data == it->data && !c->transient_for)
                             parent = it->data;
                     }
                 }