Merge branch 'backport' into work

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 495a72305be16d2d86d1fe738e4015b2e13b46eb..5d7ecb3d0f5084a08229e642e37955b733794506 100644 (file)
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -133,6 +133,12 @@ void focus_cycle_indicator_shutdown(gboolean reconfig)
     XDestroyWindow(obt_display, focus_indicator.bottom.window);
 }
 
+void focus_cycle_update_indicator(ObClient *c)
+{
+        if (visible)
+            focus_cycle_draw_indicator(c);
+}
+
 void focus_cycle_draw_indicator(ObClient *c)
 {
     if (!c && visible) {

diff --git a/openbox/focus_cycle_indicator.h b/openbox/focus_cycle_indicator.h
index 28175c7521a06a2f2ab768b5d0130d7e78f3ed24..3077f7c83a0a4db54864dc99003f8b891220c654 100644 (file)
--- a/openbox/focus_cycle_indicator.h
+++ b/openbox/focus_cycle_indicator.h
@@ -25,6 +25,7 @@ struct _ObClient;
 void focus_cycle_indicator_startup(gboolean reconfig);
 void focus_cycle_indicator_shutdown(gboolean reconfig);
 
+void focus_cycle_update_indicator(struct _ObClient *c);
 void focus_cycle_draw_indicator(struct _ObClient *c);
 
 #endif

diff --git a/openbox/frame.c b/openbox/frame.c
index 8a7b1aef441f6206624d2af5893169fb80013a71..30630fbb53c3806598026d367c48b281e0c61ba2 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -850,7 +850,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         /* 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(self->client);
+            focus_cycle_update_indicator(self->client);
     }
     if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR))
         XResizeWindow(obt_display, self->label, self->label_width,