subsurfaces: dont try to access popup surfaces when handling subsurfa…

…ce updates (#9421)
hyprwm · Feb 17, 2025 · d01f994 · d01f994
1 parent 59c615c
commit d01f994
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/desktop/Popup.cpp b/src/desktop/Popup.cpp
@@ -282,6 +282,9 @@ void CPopup::recheckTree() {
 }
 
 void CPopup::recheckChildrenRecursive() {
+    if (m_bInert || !m_pWLSurface)
+        return;
+
     std::vector<WP<CPopup>> cpy;
     std::ranges::for_each(m_vChildren, [&cpy](const auto& el) { cpy.emplace_back(el); });
     for (auto const& c : cpy) {
@@ -367,3 +370,7 @@ WP<CPopup> CPopup::at(const Vector2D& globalCoords, bool allowsInput) {
 
     return {};
 }
+
+bool CPopup::inert() const {
+    return m_bInert;
+}
diff --git a/src/desktop/Popup.hpp b/src/desktop/Popup.hpp
@@ -34,6 +34,7 @@ class CPopup {
     void           recheckTree();
 
     bool           visible();
+    bool           inert() const;
 
     // will also loop over this node
     void       breadthfirst(std::function<void(WP<CPopup>, void*)> fn, void* data);

diff --git a/src/desktop/Subsurface.cpp b/src/desktop/Subsurface.cpp
@@ -107,7 +107,7 @@ void CSubsurface::onCommit() {
 
     g_pHyprRenderer->damageSurface(m_pWLSurface->resource(), COORDS.x, COORDS.y);
 
-    if (m_pPopupParent)
+    if (m_pPopupParent && !m_pPopupParent->inert() && m_pPopupParent->m_pWLSurface)
         m_pPopupParent->recheckTree();
     if (!m_pWindowParent.expired()) // I hate you firefox why are you doing this
         m_pWindowParent->m_pPopupHead->recheckTree();
@@ -124,7 +124,7 @@ void CSubsurface::onCommit() {
         // g_pHyprRenderer->damageBox(box);
 
         CBox box;
-        if (m_pPopupParent)
+        if (m_pPopupParent && !m_pPopupParent->inert() && m_pPopupParent->m_pWLSurface)
             box = m_pPopupParent->m_pWLSurface->getSurfaceBoxGlobal().value_or(CBox{});
         else if (m_pWindowParent)
             box = m_pWindowParent->getWindowMainSurfaceBox();