commit 445cb751e6cbe81546ddddd9384ea44b597a86d7
parent 0aabe7ae768059b52a4fc9dbe86d782d8dd1fd30
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 9 Jan 2026 19:52:59 +0800
fix(pum): pumborder=shadow not blending properly (#37328)
Problem: Setting pumborder=shadow doesn't blend proerly.
Solution: Check fconfig.shadow when setting pum_grid.blending, like what
is done in check_blending().
Diffstat:
5 files changed, 25 insertions(+), 54 deletions(-)
diff --git a/runtime/colors/vim.lua b/runtime/colors/vim.lua
@@ -73,8 +73,8 @@ hi('FloatBorder', { link = 'WinSeparator' })
hi('FloatTitle', { link = 'Title' })
hi('FloatFooter', { link = 'Title' })
-hi('FloatShadow', { bg = 'Black', blend=80 })
-hi('FloatShadowThrough', { bg = 'Black', blend=100 })
+hi('FloatShadow', { bg = 'Black', blend = 80 })
+hi('FloatShadowThrough', { bg = 'Black', blend = 100 })
hi('RedrawDebugNormal', { reverse = true, cterm = { reverse = true } })
hi('RedrawDebugClear', { bg = 'Yellow', ctermbg = 'Yellow' })
hi('RedrawDebugComposed', { bg = 'Green', ctermbg = 'Green' })
diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c
@@ -175,6 +175,7 @@ static const char *highlight_init_both[] = {
"default link PmenuKindSel PmenuSel",
"default link PmenuSbar Pmenu",
"default link PmenuBorder Pmenu",
+ "default link PmenuShadow FloatShadow",
"default link PmenuShadowThrough FloatShadowThrough",
"default link PreInsert Added",
"default link ComplMatchIns NONE",
@@ -381,7 +382,6 @@ static const char *highlight_init_light[] = {
"OkMsg guifg=NvimDarkGreen ctermfg=2",
"Pmenu guibg=NvimLightGrey3 cterm=reverse",
"PmenuThumb guibg=NvimLightGrey4",
- "PmenuShadow guibg=NvimLightGrey4 ctermbg=0 blend=100",
"Question guifg=NvimDarkCyan ctermfg=6",
"QuickFixLine guifg=NvimDarkCyan ctermfg=6",
"RedrawDebugClear guibg=NvimLightYellow ctermfg=15 ctermbg=3",
@@ -467,7 +467,6 @@ static const char *highlight_init_dark[] = {
"OkMsg guifg=NvimLightGreen ctermfg=10",
"Pmenu guibg=NvimDarkGrey3 cterm=reverse",
"PmenuThumb guibg=NvimDarkGrey4",
- "PmenuShadow guibg=NvimDarkGrey4 ctermbg=0 blend=100",
"Question guifg=NvimLightCyan ctermfg=14",
"QuickFixLine guifg=NvimLightCyan ctermfg=14",
"RedrawDebugClear guibg=NvimDarkYellow ctermfg=0 ctermbg=11",
diff --git a/src/nvim/option.c b/src/nvim/option.c
@@ -2365,7 +2365,6 @@ static const char *did_set_previewwindow(optset_T *args)
static const char *did_set_pumblend(optset_T *args FUNC_ATTR_UNUSED)
{
hl_invalidate_blends();
- pum_grid.blending = (p_pb > 0);
if (pum_drawn()) {
pum_redraw();
}
diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c
@@ -649,6 +649,7 @@ void pum_redraw(void)
col_off++;
}
}
+ pum_grid.blending = p_pb > 0 || fconfig.shadow;
grid_assign_handle(&pum_grid);
pum_left_col = pum_col - col_off;
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
@@ -1063,9 +1063,10 @@ describe('builtin popupmenu', function()
[111] = { background = Screen.colors.Plum1, foreground = Screen.colors.DarkBlue },
[112] = { background = Screen.colors.Plum1, foreground = Screen.colors.DarkGreen },
[113] = { background = Screen.colors.Yellow, foreground = Screen.colors.Black },
- [114] = { background = Screen.colors.Grey0, blend = 100 },
- [115] = { background = Screen.colors.Grey0, blend = 80 },
- [116] = { blend = 100, background = Screen.colors.NvimLightGrey4 },
+ [114] = { background = Screen.colors.Black, blend = 100 },
+ [115] = { background = Screen.colors.Black, blend = 80 },
+ [116] = { foreground = Screen.colors.Black },
+ [117] = { background = Screen.colors.Grey80, foreground = Screen.colors.Black },
-- popup non-selected item
n = { background = Screen.colors.Plum1 },
-- popup scrollbar knob
@@ -9221,7 +9222,8 @@ describe('builtin popupmenu', function()
end)
it("'pumborder' with shadow", function()
command('set pumborder=shadow')
- feed('S<C-x><C-o>')
+ insert('line1\nline2line2line2line2\nline3\nline4line4line4\nline5line5')
+ feed('ggO<C-x><C-o>')
if multigrid then
screen:expect({
grid = [[
@@ -9230,16 +9232,21 @@ describe('builtin popupmenu', function()
[3:------------------------------]|
## grid 2
one^ |
- {1:~ }|*9
+ line1 |
+ line2line2line2line2 |
+ line3 |
+ line4line4line4 |
+ line5line5 |
+ {1:~ }|*4
## grid 3
{5:-- }{6:match 1 of 3} |
## grid 4
{n:1info}|
## grid 5
{12:one }{114: }|
- {n:two }{116: }|
- {n:three }{116: }|
- {114: }{116: }|
+ {n:two }{115: }|
+ {n:three }{115: }|
+ {114: }{115: }|
]],
win_pos = {
[2] = {
@@ -9254,51 +9261,16 @@ describe('builtin popupmenu', function()
[5] = { -1, 'NW', 2, 1, 0, false, 100, 2, 1, 0 },
[4] = { 1001, 'NW', 1, 1, 16, false, 50, 1, 1, 16 },
},
- win_viewport = {
- [2] = {
- win = 1000,
- topline = 0,
- botline = 2,
- curline = 0,
- curcol = 3,
- linecount = 1,
- sum_scroll_delta = 0,
- },
- [4] = {
- win = 1001,
- topline = 0,
- botline = 1,
- curline = 0,
- curcol = 0,
- linecount = 1,
- sum_scroll_delta = 0,
- },
- },
- win_viewport_margins = {
- [2] = {
- bottom = 0,
- left = 0,
- right = 0,
- top = 0,
- win = 1000,
- },
- [4] = {
- bottom = 0,
- left = 0,
- right = 0,
- top = 0,
- win = 1001,
- },
- },
})
else
screen:expect([[
one^ |
- {12:one }{114: }{n:1info}{1: }|
- {n:two }{116: }{1: }|
- {n:three }{116: }{1: }|
- {114: }{116: }{1: }|
- {1:~ }|*5
+ {12:one }{116: }{n:1info} |
+ {n:two }{117:l}ine2 |
+ {n:three }{117: } |
+ {116:l}{117:ine4line4line4 } |
+ line5line5 |
+ {1:~ }|*4
{5:-- }{6:match 1 of 3} |
]])
end
