From 4cf2b8bf8f6145b1fca9d7316854883a38ca87b5 Mon Sep 17 00:00:00 2001 From: Martin Duquesnoy Date: Fri, 23 Jul 2010 12:31:08 +0200 Subject: [PATCH] Status: Fix text drawing with systray shift --- src/status.c | 6 +++--- src/wmfs.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/status.c b/src/status.c index 519add4..9da8cfe 100644 --- a/src/status.c +++ b/src/status.c @@ -158,7 +158,7 @@ statustext_normal(int sc, char *str) strwc[j] = str[i]; /* Draw normal text without any blocks */ - draw_text(infobar[sc].bar->dr, (sgeo[sc].width - SHADH) - (textw(strwc) + sw++), + draw_text(infobar[sc].bar->dr, (sgeo[sc].width - SHADH) - (textw(strwc) + sw), FHINFOBAR, infobar[sc].bar->fg, 0, strwc); if(n) @@ -172,8 +172,8 @@ statustext_normal(int sc, char *str) for(j = 0, ++i; str[i] != '\\'; col[j++] = str[i++]); /* Draw a rectangle with the bar color to draw the text properly */ - draw_rectangle(infobar[sc].bar->dr, (sgeo[sc].width - SHADH) - textw(&buf[k]), - 0, INFOBARH - (sgeo[sc].width - SHADH) - (textw(&buf[k]) + sw), + draw_rectangle(infobar[sc].bar->dr, (sgeo[sc].width - SHADH) - (textw(&buf[k]) + sw), + 0, INFOBARH - (sgeo[sc].width - SHADH) - textw(&buf[k]), INFOBARH, conf.colors.bar); /* Draw text with its color */ diff --git a/src/wmfs.c b/src/wmfs.c index 6aa56e8..9536bc9 100644 --- a/src/wmfs.c +++ b/src/wmfs.c @@ -99,7 +99,6 @@ quit(void) infobar_destroy(); systray_freeicons(); - systray_kill(); IFREE(sgeo); IFREE(spgeo);