Redraw the focus cycle popup when the list of focusable windows changes, rather than...

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index d88be432f1a26965b6103324db9d327ae79df0a1..075d3074e5b4056ce9ff8f45004590d41bcb2088 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -708,7 +708,8 @@ void screen_set_desktop(guint num, gboolean dofocus)
     for (it = stacking_list; it; it = g_list_next(it)) {
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
-            client_show(c);
+            if (client_show(c))
+                focus_cycle_add(c);
         }
     }
 
@@ -719,8 +720,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
             if (client_hide(c)) {
-                /* in the middle of cycling..? kill it. */
-                focus_cycle_stop(c);
+                focus_cycle_remove(c);
 
                 if (c == focus_client) {
                     /* c was focused and we didn't do fallback clearly so make