From c1331a65dd12dd1128db5fb136a77218ef7376f1 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 24 Apr 2023 09:26:10 +0800 Subject: fix(pum): show right-click menu above cmdline area (#23298) --- src/nvim/popupmenu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c index 334a9bc904..9be005622b 100644 --- a/src/nvim/popupmenu.c +++ b/src/nvim/popupmenu.c @@ -399,6 +399,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed, i // room the window size will keep changing. } while (pum_set_selected(selected, redo_count) && (++redo_count <= 2)); + pum_grid.zindex = (State == MODE_CMDLINE) ? kZIndexCmdlinePopupMenu : kZIndexPopupMenu; pum_redraw(); } @@ -443,9 +444,6 @@ void pum_redraw(void) grid_assign_handle(&pum_grid); - pum_grid.zindex = ((State == MODE_CMDLINE) - ? kZIndexCmdlinePopupMenu : kZIndexPopupMenu); - bool moved = ui_comp_put_grid(&pum_grid, pum_row, pum_col - col_off, pum_height, grid_width, false, true); bool invalid_grid = moved || pum_invalid; @@ -1088,6 +1086,7 @@ void pum_show_popupmenu(vimmenu_T *menu) for (;;) { pum_is_visible = true; pum_is_drawn = true; + pum_grid.zindex = kZIndexCmdlinePopupMenu; // show above cmdline area #23275 pum_redraw(); setcursor_mayforce(true); -- cgit