From 72e692b52cb9d9ab9eb68fdcc38158c0600a59f9 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 23 May 2024 15:17:26 -0700 Subject: fix(dwm.c): barpadding and systray compatibility --- dwm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dwm.c b/dwm.c index b052d06..d0649a4 100644 --- a/dwm.c +++ b/dwm.c @@ -2676,12 +2676,12 @@ updatesystray(void) if (!showsystray) return; if (systrayonleft) - x -= sw + lrpad / 2; + x -= sw + 2 / 2 * sp + lrpad / 2; if (!systray) { /* init systray */ if (!(systray = (Systray *)calloc(1, sizeof(Systray)))) die("fatal: could not malloc() %u bytes\n", sizeof(Systray)); - systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel); + systray->win = XCreateSimpleWindow(dpy, root, x, m->by + vp, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel); wa.event_mask = ButtonPressMask | ExposureMask; wa.override_redirect = True; wa.background_pixel = scheme[SchemeNorm][ColBg].pixel; @@ -2716,8 +2716,8 @@ updatesystray(void) } w = w ? w + systrayspacing : 1; x -= w; - XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh); - wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh; + XMoveResizeWindow(dpy, systray->win, x, m->by + vp, w, bh); + wc.x = x; wc.y = m->by + vp; wc.width = w; wc.height = bh; wc.stack_mode = Above; wc.sibling = m->barwin; XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc); XMapWindow(dpy, systray->win); -- cgit v1.2.3