From b834f001869b9ec7d0600e031823063f4062d2f3 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 19 Nov 2008 17:14:38 +0100 Subject: [PATCH] Only update the focus cycle indicator when already visible in frame.c to avoid overriding bar=no --- openbox/focus_cycle_indicator.c | 6 ++++++ openbox/focus_cycle_indicator.h | 1 + openbox/frame.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c index 79de673..670f48e 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(ob_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 28175c7..3077f7c 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 235dd30..704560b 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -851,7 +851,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(ob_display, self->label, self->label_width, -- 1.9.1