barpadding: adding vanitygaps variant

This commit is contained in:
bakkeby 2022-02-11 11:43:06 +01:00
parent 90e4dfc0cf
commit 282dc2ad22
3 changed files with 17 additions and 20 deletions

21
dwm.c
View File

@ -4343,25 +4343,22 @@ updatebarpos(Monitor *m)
m->ww = m->mw; m->ww = m->mw;
m->wh = m->mh; m->wh = m->mh;
Bar *bar; Bar *bar;
#if BAR_GAPS_PADDING_PATCH && VANITYGAPS_PATCH
int y_pad = 0; int y_pad = 0;
int x_pad = 0; int x_pad = 0;
#if BAR_PADDING_VANITYGAPS_PATCH && VANITYGAPS_PATCH
#if PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH #if PERTAG_VANITYGAPS_PATCH && PERTAG_PATCH
if (!selmon || selmon->pertag->enablegaps[selmon->pertag->curtag]) { if (!selmon || selmon->pertag->enablegaps[selmon->pertag->curtag])
#else #else
if (enablegaps) { if (enablegaps)
#endif // PERTAG_VANITYGAPS_PATCH #endif // PERTAG_VANITYGAPS_PATCH
y_pad = gappov; {
x_pad = gappoh; y_pad = gappoh;
x_pad = gappov;
} }
#elif BAR_PADDING_PATCH #elif BAR_PADDING_PATCH
int y_pad = vertpad; y_pad = vertpad;
int x_pad = sidepad; x_pad = sidepad;
#else #endif // BAR_PADDING_PATCH | BAR_PADDING_VANITYGAPS_PATCH
int y_pad = 0;
int x_pad = 0;
#endif // BAR_PADDING_PATCH
#if INSETS_PATCH #if INSETS_PATCH
// Custom insets // Custom insets

View File

@ -87,16 +87,15 @@ togglegaps(const Arg *arg)
enablegaps = !enablegaps; enablegaps = !enablegaps;
#endif // PERTAG_VANITYGAPS_PATCH #endif // PERTAG_VANITYGAPS_PATCH
#if BAR_GAPS_PADDING_PATCH #if BAR_PADDING_VANITYGAPS_PATCH
updatebarpos(selmon); updatebarpos(selmon);
Bar *bar; for (Bar *bar = selmon->bar; bar; bar = bar->next)
for (bar = selmon->bar; bar; bar = bar->next)
XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh); XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
#if BAR_SYSTRAY_PATCH #if BAR_SYSTRAY_PATCH
drawbarwin(systray->bar); drawbarwin(systray->bar);
#endif // BAR_SYSTRAY_PATCH #endif // BAR_SYSTRAY_PATCH
#endif // BAR_GAPS_PADDING_PATCH #endif // BAR_PADDING_VANITYGAPS_PATCH
arrange(NULL); arrange(NULL);
} }

View File

@ -347,11 +347,12 @@
*/ */
#define BAR_PADDING_PATCH 0 #define BAR_PADDING_PATCH 0
/* Same as barpadding patch but specifically written for the vanitygaps patch. It adds the same /* Same as barpadding patch but specifically tailored for the vanitygaps patch in that the outer
* outer horizontal and vertical padding as vanity gaps. Moreover, the padding is toggled whenever * bar padding is derived from the vanitygaps settings. In addition to this the bar padding is
* vanitygaps are toggled. * toggled in unison when vanitygaps are toggled. Increasing or decreasing gaps during runtime
* will not affect the bar padding.
*/ */
#define BAR_GAPS_PADDING_PATCH 0 #define BAR_PADDING_VANITYGAPS_PATCH 0
/* This patch adds simple markup for status messages using pango markup. /* This patch adds simple markup for status messages using pango markup.
* This depends on the pango library v1.44 or greater. * This depends on the pango library v1.44 or greater.