From 5a62ad605e4945562d5defb5eb6a2e8a88107ebf Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 30 Jun 2022 21:42:39 +0800
Subject: feat(ui): make right-click menu work properly with ext_multigrid

Add tests both with and without ext_multigrid.
---
 src/nvim/popupmnu.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index befed415a6..ba151b5ce2 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -940,14 +940,17 @@ void pum_set_event_info(dict_T *dict)
 
 static void pum_position_at_mouse(int min_width)
 {
+  pum_anchor_grid = mouse_grid;
   if (Rows - mouse_row > pum_size) {
     // Enough space below the mouse row.
+    pum_above = false;
     pum_row = mouse_row + 1;
     if (pum_height > Rows - pum_row) {
       pum_height = Rows - pum_row;
     }
   } else {
     // Show above the mouse row, reduce height if it does not fit.
+    pum_above = true;
     pum_row = mouse_row - pum_size;
     if (pum_row < 0) {
       pum_height += pum_row;
@@ -971,6 +974,14 @@ static void pum_position_at_mouse(int min_width)
 /// Select the pum entry at the mouse position.
 static void pum_select_mouse_pos(void)
 {
+  if (mouse_grid == pum_grid.handle) {
+    pum_selected = mouse_row;
+    return;
+  } else if (mouse_grid > 1) {
+    pum_selected = -1;
+    return;
+  }
+
   int idx = mouse_row - pum_row;
 
   if (idx < 0 || idx >= pum_size) {
-- 
cgit