fix: resolved merge with statuscmd patch

This commit is contained in:
Solomon Laing 2026-03-14 21:00:17 +10:30
parent bd32ae7251
commit c53b9adb0b

9
dwm.c
View File

@ -521,8 +521,8 @@ buttonpress(XEvent *e)
arg.ui = 1 << i;
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
click = ClkLtSymbol;
else if (ev->x > selmon->ww - statusw - (int)TEXTW(stext) + lrpad - 2 - getsystraywidth())
x = selmon->ww - statusw;
else if (ev->x > selmon->ww - statusw - (int)TEXTW(stext) + lrpad - 2 - getsystraywidth()) {
x = selmon->ww - statusw - getsystraywidth();
click = ClkStatusText;
statussig = 0;
for (text = s = stext; *s && x <= ev->x; s++) {
@ -895,15 +895,14 @@ drawbar(Monitor *m)
ch = *s;
*s = '\0';
tw = TEXTW(text) - lrpad;
drw_text(drw, m->ww - statusw + x, 0, tw, bh, 0, text, 0);
drw_text(drw, m->ww - stw - statusw + x, 0, tw, bh, 0, text, 0);
x += tw;
*s = ch;
text = s + 1;
}
}
tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px extra right padding */
drw_text(drw, m->ww - tw - stw - statusw + x, 0, tw, bh, lrpad / 2 - 2, stext, 0);
drw_text(drw, m->ww - stw - statusw + x, 0, tw, bh, lrpad / 2 - 2, stext, 0);
tw = statusw;
}