From 1cc9a44318e53a34f41cc36483502de985b88cf8 Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Sat, 30 Mar 2024 20:50:25 -0400 Subject: [PATCH] input: Fix incorrect keyboard focus taken when no window was present (#5337) A non-keyboard layer never needs keyboard focus --- src/managers/input/InputManager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 690463fa..4e2bf709 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -422,10 +422,8 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { unsetCursorImage(); } - if (pFoundLayerSurface && - (pFoundLayerSurface->layerSurface->current.keyboard_interactive != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_NONE || - (pFoundLayerSurface->layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP && !g_pCompositor->m_pLastWindow)) && - FOLLOWMOUSE != 3 && allowKeyboardRefocus) { + if (pFoundLayerSurface && (pFoundLayerSurface->layerSurface->current.keyboard_interactive != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_NONE) && FOLLOWMOUSE != 3 && + allowKeyboardRefocus) { g_pCompositor->focusSurface(foundSurface); }