commit 4e1ca0d9a6c6d66987da67155e97f83f286ffbcc
author zeertzjq <zeertzjq@outlook.com> Thu Apr 27 19:36:55 2023 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Apr 27 19:36:55 2023 +0100
tree 63a7c548e7e2ad2ffad040a1998243cf6adcd805
parent b7f2270bab102d68f83a6300699b7f98efad81f2

patch 9.0.1493: popup menu position wrong in window with toolbar

Problem:    Popup menu position wrong in window with toolbar.
Solution:   Take the window toolbar into account when positioning the popup
            menu. (closes #12308)

src/popupmenu.c

diff --git a/src/popupmenu.c b/src/popupmenu.c
index 36d3b99..9cba669 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -1649,7 +1649,7 @@
     {
 	// Hack: set mouse position at the cursor so that the menu pops up
 	// around there.
-	mouse_row = curwin->w_winrow + curwin->w_wrow;
+	mouse_row = W_WINROW(curwin) + curwin->w_wrow;
 	mouse_col = curwin->w_wincol + curwin->w_wcol;
     }