layerSurface: forcibly unfocus surfaces when made non interactive

hyprwm · Jun 10, 2024 · 58db6f7 · 58db6f7
1 parent 7347996
commit 58db6f7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/desktop/LayerSurface.cpp b/src/desktop/LayerSurface.cpp
@@ -297,10 +297,13 @@ void CLayerSurface::onCommit() {
             std::erase_if(g_pInputManager->m_dExclusiveLSes, [this](const auto& other) { return !other.lock() || other.lock() == self.lock(); });
 
         // if the surface was focused and interactive but now isn't, refocus
-        if (WASLASTFOCUS && !layerSurface->current.interactivity)
+        if (WASLASTFOCUS && !layerSurface->current.interactivity) {
+            // moveMouseUnified won't focus non interactive layers but it won't unfocus them either,
+            // so unfocus the surface here.
+            g_pCompositor->focusSurface(nullptr);
             g_pInputManager->refocusLastWindow(g_pCompositor->getMonitorFromID(monitorID));
-        else if (!WASEXCLUSIVE && !WASLASTFOCUS &&
-                 (ISEXCLUSIVE || (layerSurface->current.interactivity && (g_pSeatManager->mouse.expired() || !g_pInputManager->isConstrained())))) {
+        } else if (!WASEXCLUSIVE && !WASLASTFOCUS &&
+                   (ISEXCLUSIVE || (layerSurface->current.interactivity && (g_pSeatManager->mouse.expired() || !g_pInputManager->isConstrained())))) {
             // if not focused last and exclusive or accepting input + unconstrained
             g_pSeatManager->setGrab(nullptr);
             g_pInputManager->releaseAllMouseButtons();