From c5468febb5552f85c3492070403d97e482670222 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Wed, 12 Apr 2023 18:48:35 +0200 Subject: templates: change layered fg & bg color priorities This is mostly a revert of commit ae4d742c5a90 ("templates: fix layered fg & bg color for inline styles"). As it turns out, context colors (msglist_selected, msglist_marked, msglist_deleted, etc.) need to have priority over inline colors. Otherwise strange and confusing results occur. Reported-by: Skejg Signed-off-by: Robin Jarry Tested-by: Tim Culverhouse --- doc/aerc-stylesets.7.scd | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/aerc-stylesets.7.scd b/doc/aerc-stylesets.7.scd index 7e4313c7..218813fe 100644 --- a/doc/aerc-stylesets.7.scd +++ b/doc/aerc-stylesets.7.scd @@ -178,13 +178,12 @@ Example: red.fg=red ``` -User styles have priority over every other styles applied to the context in -which they are rendered. However, they are layered on top of the context style -using some form of "transparency". Only the defined colors (fg and/or bg) will -override the underlying style. Other boolean attributes will be merged with the -underlying style boolean attributes. +User styles are layered with other styles applied to the context in which they +are rendered. The user style colors (fg and/or bg) will only be effective if the +context style does not define any. Other boolean attributes will be merged with +the underlying style boolean attributes. -For example, if the underlying/context style is: +For example, if the context style is: fg=red bold @@ -194,7 +193,7 @@ And the inline style is: The effective style will be: - fg=yellow bold italic underline + fg=red bold italic underline # FNMATCH STYLE WILDCARD MATCHING -- cgit