Calculate offset correctly, fixes incorrect offset and prevents crash when

status-left is empty. From Micah Cowan.
This commit is contained in:
Nicholas Marriott 2010-01-27 20:26:42 +00:00
parent 3e2cc2d2c4
commit 05213e4c8c

View File

@ -302,18 +302,20 @@ draw:
} }
/* Figure out the offset for the window list. */ /* Figure out the offset for the window list. */
wloffset = 1; if (llen != 0)
wloffset = llen + 1;
else
wloffset = 0;
if (wlwidth < wlavailable) { if (wlwidth < wlavailable) {
switch (options_get_number(&s->options, "status-justify")) { switch (options_get_number(&s->options, "status-justify")) {
case 1: /* centered */ case 1: /* centered */
wloffset = 1 + (wlavailable - wlwidth) / 2; wloffset += (wlavailable - wlwidth) / 2;
break; break;
case 2: /* right */ case 2: /* right */
wloffset = 1 + (wlavailable - wlwidth); wloffset += (wlavailable - wlwidth);
break; break;
} }
} }
wloffset += llen;
if (larrow != 0) if (larrow != 0)
wloffset++; wloffset++;