Viewporter implementaion (#585)

Implementation of the `wp_viewporter` core protocol and some bugfixes

1 files changed, 7 insertions, 1 deletions

diff --git a/src/events/Popups.cpp b/src/events/Popups.cpp
index f48f71be..5f5dbdab 100644
--- a/src/events/Popups.cpp
+++ b/src/events/Popups.cpp
@@ -18,14 +18,20 @@
 void addPopupGlobalCoords(void* pPopup, int* x, int* y) {
     SXDGPopup *const PPOPUP = (SXDGPopup*)pPopup;
 
+    auto curPopup = PPOPUP;
+
     int px = 0;
     int py = 0;
 
-    auto curPopup = PPOPUP;
     while (true) {
         px += curPopup->popup->current.geometry.x;
         py += curPopup->popup->current.geometry.y;
 
+        if (curPopup == PPOPUP && PPOPUP->parentWindow) {
+            px -= curPopup->popup->base->current.geometry.x;
+            py -= curPopup->popup->base->current.geometry.y;
+        }
+
         // fix oversized fucking popups 
         // kill me
         if (curPopup->pSurfaceTree && curPopup->pSurfaceTree->pSurface && !curPopup->parentPopup) {