only restack group windows on the same desktop

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index fdca7be7a475949c02280707dc017ddb57000945..ec7464a1e2280b22fef99e1dd52801f298740bc5 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "framerender.h"
 #include "mainloop.h"
+#include "focus.h"
 #include "moveresize.h"
 #include "render/theme.h"
 
@@ -182,17 +183,17 @@ static void frame_free(ObFrame *self)
 void frame_show(ObFrame *self)
 {
     if (!self->visible) {
-       self->visible = TRUE;
-       XMapWindow(ob_display, self->window);
+        self->visible = TRUE;
+        XMapWindow(ob_display, self->window);
     }
 }
 
 void frame_hide(ObFrame *self)
 {
     if (self->visible) {
-       self->visible = FALSE;
-       self->client->ignore_unmaps++;
-       XUnmapWindow(ob_display, self->window);
+        self->visible = FALSE;
+        self->client->ignore_unmaps++;
+        XUnmapWindow(ob_display, self->window);
     }
 }
 
@@ -420,6 +421,11 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             PROP_SETA32(self->client->window, kde_net_wm_frame_strut,
                         cardinal, vals, 4);
         }
+
+        /* if this occurs while we are focus cycling, the indicator needs to
+           match the changes */
+        if (focus_cycle_target == self->client)
+            focus_cycle_draw_indicator();
     }
 }