diff options
| author | bakkeby <[email protected]> | 2020-07-01 16:16:19 +0200 |
|---|---|---|
| committer | bakkeby <[email protected]> | 2020-07-01 16:16:19 +0200 |
| commit | 8120e0b858b9666987ebe68ae6d1011e6dda204d (patch) | |
| tree | 0d4fb6283c0af22a855b63e2f7744983c1afbcb6 | |
| parent | 9e8d70788cfd03ca05ca57fab0b469f40c6f47e0 (diff) | |
| download | dwm-flexipatch-8120e0b858b9666987ebe68ae6d1011e6dda204d.tar.gz dwm-flexipatch-8120e0b858b9666987ebe68ae6d1011e6dda204d.zip | |
Fixed a dwmblocks / statuscmd / systray compatibility issue where button clicks would be misaligned if systray pinning is used and systray is on another monitor
| -rw-r--r-- | dwm.c | 7 | ||||
| -rw-r--r-- | patch/systray.c | 4 |
2 files changed, 6 insertions, 5 deletions
@@ -838,9 +838,6 @@ buttonpress(XEvent *e) #if BARPADDING_PATCH padding -= sp * 2; #endif // BARPADDING_PATCH - #if SYSTRAY_PATCH - padding -= getsystraywidth(); - #endif // SYSTRAY_PATCH #if TAGGRID_PATCH columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0); #endif // TAGGRID_PATCH @@ -855,6 +852,10 @@ buttonpress(XEvent *e) selmon = m; focus(NULL); } + #if SYSTRAY_PATCH + if (showsystray && selmon == systraytomon(selmon)) + padding -= getsystraywidth(); + #endif // SYSTRAY_PATCH if (ev->window == selmon->barwin) { i = x = 0; #if LEFTLAYOUT_PATCH diff --git a/patch/systray.c b/patch/systray.c index e3b0796..107bcbc 100644 --- a/patch/systray.c +++ b/patch/systray.c @@ -47,8 +47,8 @@ systraytomon(Monitor *m) return selmon; return m == selmon ? m : NULL; } - for (n = 1, t = mons; t && t->next; n++, t = t->next) ; - for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ; + for (n = 1, t = mons; t && t->next; n++, t = t->next); + for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next); if (systraypinningfailfirst && n < systraypinning) return mons; return t; |