mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-15 22:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(highlight): preserve background transparency in 'winblend' #34302

Browse Source 
Problem: When using 'winblend', transparent backgrounds (-1) are forced
to default colors (usually black) during attribute blending, breaking
the transparency effect.

Solution: Check original background colors before blending in
hl_blend_attrs(). If both background and foreground originally had
transparent backgrounds, preserve transparency instead of forcing
default colors.
This commit is contained in:
glepnir
2025-06-09 23:24:46 +08:00
committed by GitHub
parent 8fadb80b3a
commit 336b46a879
3 changed files with 100 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/highlight.c
View File

@@ -666,9 +666,8 @@ int hl_combine_attr(int char_attr, int prim_attr)
///
/// If colors are unset, use builtin default colors. Never returns -1
/// Cterm colors are unchanged.
static HlAttrs get_colors_force(int attr)
static HlAttrs get_colors_force(HlAttrs attrs)
{
HlAttrs attrs = syn_attr2entry(attr);
if (attrs.rgb_bg_color == -1) {
attrs.rgb_bg_color = normal_bg;
}
@@ -704,7 +703,8 @@ int hl_blend_attrs(int back_attr, int front_attr, bool *through)
return front_attr;
}
HlAttrs fattrs = get_colors_force(front_attr);
HlAttrs fattrs_raw = syn_attr2entry(front_attr);
HlAttrs fattrs = get_colors_force(fattrs_raw);
int ratio = fattrs.hl_blend;
if (ratio <= 0) {
*through = false;
@@ -720,7 +720,8 @@ int hl_blend_attrs(int back_attr, int front_attr, bool *through)
return id;
}
HlAttrs battrs = get_colors_force(back_attr);
HlAttrs battrs_raw = syn_attr2entry(back_attr);
HlAttrs battrs = get_colors_force(battrs_raw);
HlAttrs cattrs;
if (*through) {
@@ -754,11 +755,13 @@ int hl_blend_attrs(int back_attr, int front_attr, bool *through)
cattrs.rgb_ae_attr &= ~HL_BG_INDEXED;
}
cattrs.rgb_bg_color = rgb_blend(ratio, battrs.rgb_bg_color,
fattrs.rgb_bg_color);
// Check if we should preserve background transparency
// Use the raw attributes (before forcing colors) to check original transparency
cattrs.rgb_bg_color = (battrs_raw.rgb_bg_color == -1) && (fattrs_raw.rgb_bg_color == -1)
? -1
: rgb_blend(ratio, battrs.rgb_bg_color, fattrs.rgb_bg_color);
cattrs.hl_blend = -1; // blend property was consumed
HlKind kind = *through ? kHlBlendThrough : kHlBlend;
id = get_attr_entry((HlEntry){ .attr = cattrs, .kind = kind,
.id1 = back_attr, .id2 = front_attr });