fix popup damage issues on LS

2 files changed, 1 insertions, 6 deletions

diff --git a/src/events/Popups.cpp b/src/events/Popups.cpp
index 6be94453..5f5dbdab 100644
--- a/src/events/Popups.cpp
+++ b/src/events/Popups.cpp
@@ -27,7 +27,7 @@ void addPopupGlobalCoords(void* pPopup, int* x, int* y) {
         px += curPopup->popup->current.geometry.x;
         py += curPopup->popup->current.geometry.y;
 
-        if (curPopup == PPOPUP) {
+        if (curPopup == PPOPUP && PPOPUP->parentWindow) {
             px -= curPopup->popup->base->current.geometry.x;
             py -= curPopup->popup->base->current.geometry.y;
         }
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 23ee5f11..ce0cc616 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -17,11 +17,6 @@ void renderSurface(struct wlr_surface* surface, int x, int y, void* data) {
     else                                                                                              //  here we clamp to 2, these might be some tiny specks
         windowBox = {(int)outputX + RDATA->x + x, (int)outputY + RDATA->y + y, std::clamp(surface->current.width, 2, 1337420), std::clamp(surface->current.height, 2, 1337420)};
     
-    // squish all oversized but dont in some cases, jesus christ this is a mess
-    // TODO: this shouldn't be done this way. Custom UV here as well.
-    // this is fucking horrible
-    // Issue: will cause oversized apps with reserved area to overflow from the window box. (see chromium on ozone wayland)
-    const auto PRESQUISHSIZE = Vector2D(windowBox.width, windowBox.height);
     if (RDATA->squishOversized) {
         if (x + windowBox.width > RDATA->w)
             windowBox.width = RDATA->w - x;