penwing/zeniba-nsxiv
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

win_draw_bar: simplify logic a bit

Browse source
This commit is contained in:
NRK 2024-06-12 21:28:07 +00:00
parent b6d9e7d24f
commit 1fbff6d539
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
window.c
View file

@ -470,17 +470,15 @@ static void win_draw_bar(win_t *win)
XSetBackground(e->dpy, gc, win->bar_bg.pixel); XSetBackground(e->dpy, gc, win->bar_bg.pixel);
if ((len = strlen(r->buf)) > 0) { if ((len = strlen(r->buf)) > 0) {
if ((tw = TEXTWIDTH(win, r->buf, len)) > w) { if ((tw = TEXTWIDTH(win, r->buf, len)) <= w) {
XftDrawDestroy(d); x = win->w - tw - H_TEXT_PAD;
return; win_draw_text(win, d, &win->bar_fg, x, y, r->buf, len, tw);
} }
x = win->w - tw - H_TEXT_PAD; /* remaining width, also keeping gap between left and right parts */
w -= tw; w -= tw + (2 * H_TEXT_PAD);
win_draw_text(win, d, &win->bar_fg, x, y, r->buf, len, tw);
} }
if ((len = strlen(l->buf)) > 0) { if ((len = strlen(l->buf)) > 0 && w > 0) {
x = H_TEXT_PAD; x = H_TEXT_PAD;
w -= 2 * H_TEXT_PAD; /* gap between left and right parts */
win_draw_text(win, d, &win->bar_fg, x, y, l->buf, len, w); win_draw_text(win, d, &win->bar_fg, x, y, l->buf, len, w);
} }
XftDrawDestroy(d); XftDrawDestroy(d);