From 40d8fa84919c6d0e9fcb1536f4bc09710d4c031c Mon Sep 17 00:00:00 2001 From: Nikolai Nechaev Date: Wed, 26 Nov 2025 07:44:26 +0900 Subject: compositor: Configurable behavior when window to be focused conflicts with fullscreen (#12033) Renames `misc:new_window_takes_over_fullscreen` into `misc:on_focus_under_fullscreen` and implements the following behavior: - By default, when a tiling window is being focused on a workspace where a fullscreen/maximized window exists, respect the `misc:on_focus_under_fullscreen` config variable. --- src/desktop/rule/windowRule/WindowRule.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/desktop/rule/windowRule/WindowRule.cpp') diff --git a/src/desktop/rule/windowRule/WindowRule.cpp b/src/desktop/rule/windowRule/WindowRule.cpp index 6a6878d2..893243b0 100644 --- a/src/desktop/rule/windowRule/WindowRule.cpp +++ b/src/desktop/rule/windowRule/WindowRule.cpp @@ -3,6 +3,7 @@ #include "../../../helpers/Monitor.hpp" #include "../../../Compositor.hpp" #include "../../../managers/TokenManager.hpp" +#include "../../../desktop/state/FocusState.hpp" using namespace Desktop; using namespace Desktop::Rule; @@ -72,7 +73,7 @@ bool CWindowRule::matches(PHLWINDOW w, bool allowEnvLookup) { return false; break; case RULE_PROP_FOCUS: - if (!engine->match(g_pCompositor->m_lastWindow == w)) + if (!engine->match(Desktop::focusState()->window() == w)) return false; break; case RULE_PROP_GROUP: -- cgit v1.2.3