From 76f7c2510e267bb695ae4fd175ac2f3db8557dba Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Sun, 31 Jul 2022 14:05:47 +0200
Subject: [PATCH] account for geom in initial XDG window popups

---
 src/events/Popups.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/events/Popups.cpp b/src/events/Popups.cpp
index 53f8de8e..c1856ac9 100644
--- a/src/events/Popups.cpp
+++ b/src/events/Popups.cpp
@@ -104,9 +104,12 @@ void Events::listener_newPopupXDG(void* owner, void* data) {
 
     const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
 
+    wlr_box geom;
+    wlr_xdg_surface_get_geometry(PWINDOW->m_uSurface.xdg, &geom);
+
     PNEWPOPUP->popup = WLRPOPUP;
-    PNEWPOPUP->lx = PWINDOW->m_vRealPosition.goalv().x;
-    PNEWPOPUP->ly = PWINDOW->m_vRealPosition.goalv().y;
+    PNEWPOPUP->lx = PWINDOW->m_vRealPosition.goalv().x - geom.x;
+    PNEWPOPUP->ly = PWINDOW->m_vRealPosition.goalv().y - geom.y;
     PNEWPOPUP->parentWindow = PWINDOW;
     PNEWPOPUP->monitor = PMONITOR;
     createNewPopup(WLRPOPUP, PNEWPOPUP);