From 963816b9a6524a99a6716fa1aa30b2c4f369d2f0 Mon Sep 17 00:00:00 2001
From: vaxerski <vaxry@vaxry.net>
Date: Sat, 27 Jul 2024 15:03:52 +0200
Subject: layersurface: fixup focus issues in onUnmap

fixes #6929
---
 src/desktop/WLSurface.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/desktop/WLSurface.cpp')

diff --git a/src/desktop/WLSurface.cpp b/src/desktop/WLSurface.cpp
index 90924145..e1348a90 100644
--- a/src/desktop/WLSurface.cpp
+++ b/src/desktop/WLSurface.cpp
@@ -1,6 +1,7 @@
 #include "WLSurface.hpp"
 #include "../Compositor.hpp"
 #include "../protocols/core/Compositor.hpp"
+#include "../protocols/LayerShell.hpp"
 
 void CWLSurface::assign(SP<CWLSurfaceResource> pSurface) {
     m_pResource = pSurface;
@@ -222,3 +223,11 @@ SP<CWLSurface> CWLSurface::fromResource(SP<CWLSurfaceResource> pSurface) {
         return nullptr;
     return pSurface->hlSurface.lock();
 }
+
+bool CWLSurface::keyboardFocusable() const {
+    if (m_pWindowOwner || m_pPopupOwner || m_pSubsurfaceOwner)
+        return true;
+    if (m_pLayerOwner)
+        return m_pLayerOwner->layerSurface->current.interactivity != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_NONE;
+    return false;
+}
-- 
cgit v1.2.3