From 2ff88b858812ac1f83dbfe81178f4b834056f183 Mon Sep 17 00:00:00 2001 From: Alexis Jhon Gaspar Date: Tue, 3 Oct 2023 22:53:43 +0800 Subject: [PATCH] Fix systray padding --- dwm-flexipatch/patch/bar_systray.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dwm-flexipatch/patch/bar_systray.c b/dwm-flexipatch/patch/bar_systray.c index be337e4..f80aff5 100644 --- a/dwm-flexipatch/patch/bar_systray.c +++ b/dwm-flexipatch/patch/bar_systray.c @@ -13,7 +13,14 @@ width_systray(Bar *bar, BarArg *a) if (!w) XMoveWindow(dpy, systray->win, -systray->h, bar->by); } - return w ? w + lrpad - systrayspacing : 0; + + if (w) { + w += lrpad / 2 - systrayspacing; + #if !BAR_STATUS_PATCH + w += lrpad / 2; + #endif // BAR_STATUS_PATCH + } + return w; } int @@ -94,7 +101,11 @@ draw_systray(Bar *bar, BarArg *a) i->mon = bar->mon; } - XMoveResizeWindow(dpy, systray->win, bar->bx + a->x + lrpad / 2, (w ? bar->by + a->y + (a->h - systray->h) / 2: -systray->h), MAX(w, 1), systray->h); + unsigned int xpos = bar->bx + a->x + lrpad / 2; + #if BAR_STATUS_PATCH + xpos -= lrpad / 2; + #endif // BAR_STATUS_PATCH + XMoveResizeWindow(dpy, systray->win, xpos, (w ? bar->by + a->y + (a->h - systray->h) / 2: -bar->by - a->y), MAX(w, 1), systray->h); return w; }