From: Dana Jansens <danakj@orodu.net>
Date: Sun, 6 May 2007 05:38:02 +0000 (+0000)
Subject: merge r6102 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~154
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=bffceb739cd0349d7e9b2688d0d053f1502fa76a;p=dana%2Fopenbox.git

merge r6102 from trunk
---

diff --git a/openbox/focus.c b/openbox/focus.c
index 35a2e027..cf65ff25 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -37,6 +37,8 @@
 #include <glib.h>
 #include <assert.h>
 
+#define FOCUS_INDICATOR_WIDTH 5
+
 ObClient *focus_client = NULL;
 GList *focus_order = NULL;
 ObClient *focus_cycle_target = NULL;
@@ -340,10 +342,7 @@ void focus_cycle_draw_indicator()
         gint x, y, w, h;
         gint wt, wl, wr, wb;
 
-        wt = wl = wr = wb = MAX(3,
-                                MAX(1, MAX(ob_rr_theme->paddingx,
-                                           ob_rr_theme->paddingy)) * 2 +
-                                ob_rr_theme->fbwidth * 2);
+        wt = wl = wr = wb = FOCUS_INDICATOR_WIDTH;
 
         x = focus_cycle_target->frame->area.x;
         y = focus_cycle_target->frame->area.y;