Simplification of color configuration; settling on a set of color schemes that is shared between multiple patches (urgentborder, floatborder and titlecolor patches made non-optional)

This commit is contained in:
bakkeby
2020-08-21 15:49:15 +02:00
parent 6b9c484b78
commit 81488b4862
14 changed files with 168 additions and 342 deletions

View File

@@ -157,13 +157,13 @@ getschemefor(Monitor *m, int group, int activegroup)
if (m->lt[m->sellt]->arrange == &monocle)
return (activegroup ? SchemeFlexActMONO : SchemeFlexInaMONO);
#endif // MONOCLE_LAYOUT
return SchemeNorm;
return SchemeTitleNorm;
case GRP_HIDDEN:
return SchemeHid;
case GRP_FLOAT:
return (activegroup ? SchemeFlexActFloat : SchemeFlexInaFloat);
}
return SchemeNorm;
return SchemeTitleNorm;
}
int
@@ -175,7 +175,7 @@ getselschemefor(int scheme)
return scheme + SchemeFlexInaTTB - SchemeFlexActTTB;
if (scheme >= SchemeFlexActTTB)
return scheme + SchemeFlexSelTTB - SchemeFlexActTTB;
return SchemeSel;
return SchemeTitleSel;
}
void
@@ -190,10 +190,8 @@ flextitledraw(Monitor *m, Client *c, int unused, int x, int w, int tabscheme, Ar
? getselschemefor(tabscheme)
: HIDDEN(c)
? SchemeHid
#if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH
: c->isurgent
? SchemeUrg
#endif
: tabscheme
)]);
if (w <= TEXTW("A") - lrpad + pad) // reduce text padding if wintitle is too small