layout: Trigger layout recalcuation on deco position/size change (#5821)

* Trigger layout recalcuation on deco position/size change * Remove now unneeded code * Formatting
hyprwm · May 1, 2024 · d2899a6 · d2899a6
1 parent ed58cc4
commit d2899a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
@@ -184,7 +184,6 @@ SWindowDecorationExtents CWindow::getFullWindowReservedArea() {
 }
 
 void CWindow::updateWindowDecos() {
-    bool recalc = false;
 
     if (!m_bIsMapped || isHidden())
         return;
@@ -193,8 +192,7 @@ void CWindow::updateWindowDecos() {
         for (auto it = m_dWindowDecorations.begin(); it != m_dWindowDecorations.end(); it++) {
             if (it->get() == wd) {
                 g_pDecorationPositioner->uncacheDecoration(it->get());
-                it     = m_dWindowDecorations.erase(it);
-                recalc = true;
+                it = m_dWindowDecorations.erase(it);
                 if (it == m_dWindowDecorations.end())
                     break;
             }
@@ -203,9 +201,6 @@ void CWindow::updateWindowDecos() {
 
     g_pDecorationPositioner->onWindowUpdate(m_pSelf.lock());
 
-    if (recalc)
-        g_pLayoutManager->getCurrentLayout()->recalculateWindow(m_pSelf.lock());
-
     m_vDecosToRemove.clear();
 
     // make a copy because updateWindow can remove decos.

diff --git a/src/render/decorations/DecorationPositioner.cpp b/src/render/decorations/DecorationPositioner.cpp
@@ -267,6 +267,7 @@ void CDecorationPositioner::onWindowUpdate(PHLWINDOW pWindow) {
     }
 
     WINDOWDATA->extents = {{stickyOffsetXL + reservedXL, stickyOffsetYT + reservedYT}, {stickyOffsetXR + reservedXR, stickyOffsetYB + reservedYB}};
+    g_pLayoutManager->getCurrentLayout()->recalculateWindow(pWindow);
 }
 
 void CDecorationPositioner::onWindowUnmap(PHLWINDOW pWindow) {
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         WINDOWDATA->extents = {{stickyOffsetXL + reservedXL, stickyOffsetYT + reservedYT}, {stickyOffsetXR + reservedXR, stickyOffsetYB + reservedYB}};
+        g_pLayoutManager->getCurrentLayout()->recalculateWindow(pWindow);
     }
     void CDecorationPositioner::onWindowUnmap(PHLWINDOW pWindow) {
@@ Expand Down @@