From 4688ad181da14be36e034918580ec0ce5968ffdb Mon Sep 17 00:00:00 2001 From: "arg@10ksloc.org" Date: Thu, 20 Jul 2006 15:07:35 +0200 Subject: made status bar drawing more robust, implemented togglemax and togglemode, works quite well --- draw.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'draw.c') diff --git a/draw.c b/draw.c index b5d8bd2..0c920e5 100644 --- a/draw.c +++ b/draw.c @@ -107,7 +107,7 @@ drawall() void drawstatus() { - int i; + int i, x; Bool istile = arrange == dotile; dc.x = dc.y = 0; @@ -123,15 +123,14 @@ drawstatus() else drawtext(tags[i], (i != tsel), True); } - if(sel) { - dc.x += dc.w; - dc.w = textw(sel->name); - drawtext(sel->name, istile, True); - } + x = dc.x + dc.w; dc.w = textw(stext); dc.x = bx + bw - dc.w; drawtext(stext, !istile, False); - + if(sel && ((dc.w = dc.x - x) >= bh)) { + dc.x = x; + drawtext(sel->name, istile, True); + } XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); XSync(dpy, False); } -- cgit v1.2.3-70-g09d2