From: Dana Jansens <danakj@orodu.net>
Date: Fri, 10 Oct 2003 03:45:01 +0000 (+0000)
Subject: only restack group windows on the same desktop
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=322fc41e496022b1fdfc4753424146496148f232;p=chaz%2Fopenbox

only restack group windows on the same desktop
---

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 2a57e1a3..287de4f0 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -245,15 +245,18 @@ static GList *pick_group_windows(ObClient *top, ObClient *selected,
             next = g_list_next(it);
 
             if ((sit = g_slist_find(top->group->members, it->data))) {
+                ObClient *c;
                 ObClientType t;
 
                 ++i;
-
-                t = ((ObClient*)it->data)->type;
-
-                if (t == OB_CLIENT_TYPE_TOOLBAR ||
-                    t == OB_CLIENT_TYPE_MENU ||
-                    t == OB_CLIENT_TYPE_UTILITY)
+                c = it->data;
+                t = c->type;
+
+                if ((c->desktop == selected->desktop ||
+                     c->desktop == DESKTOP_ALL) &&
+                    (t == OB_CLIENT_TYPE_TOOLBAR ||
+                     t == OB_CLIENT_TYPE_MENU ||
+                     t == OB_CLIENT_TYPE_UTILITY))
                 {
                     ret = g_list_concat(ret,
                                         pick_windows(sit->data,