From c61d6bc46aab9f5dd71639ef6b4d6c2baeda7e66 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:33:13 +0200
Subject: Wayland: fix regression in menu positioning brought by c43cf2f

---
 src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/drivers')

diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
index 11ea1ad51..8e6d94499 100644
--- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
@@ -1676,7 +1676,9 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) {
   if (fl_win && fl_win->kind == DECORATED && !xdg_toplevel()) {
     pWindow->wait_for_expose();
   }
-  if (!pWindow->parent()) X = Y = 0; // toplevel windows must have origin at 0,0
+  // toplevel, non-popup windows must have origin at 0,0
+  if (!pWindow->parent() &&
+      !(pWindow->menu_window() || pWindow->tooltip_window())) X = Y = 0;
   int is_a_move = (X != x() || Y != y());
   bool true_rescale = Fl_Window::is_a_rescale();
   if (fl_win && fl_win->buffer) {
-- 
cgit v1.2.3