From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 19 Nov 2008 16:43:56 +0000 (+0100)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=90cecafa3de2f118e550622932d1d30266c71226;hp=bd2db36b6cbbc04614e0444fbf652f0a24f8f3ac;p=chaz%2Fopenbox

Merge branch 'backport' into work
---

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 495a7230..5d7ecb3d 100644
--- 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 28175c75..3077f7c8 100644
--- 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 8a7b1aef..30630fbb 100644
--- 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,