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.
This commit is contained in:
parent
1c1746de61
commit
40d8fa8491
51 changed files with 1003 additions and 694 deletions
|
|
@ -1,8 +1,7 @@
|
|||
#include "TextInput.hpp"
|
||||
#include "../../defines.hpp"
|
||||
#include "InputManager.hpp"
|
||||
#include "../../protocols/TextInputV1.hpp"
|
||||
#include "../../Compositor.hpp"
|
||||
#include "../../desktop/state/FocusState.hpp"
|
||||
#include "../../protocols/TextInputV3.hpp"
|
||||
#include "../../protocols/InputMethodV2.hpp"
|
||||
#include "../../protocols/core/Compositor.hpp"
|
||||
|
|
@ -31,8 +30,8 @@ void CTextInput::initCallbacks() {
|
|||
g_pInputManager->m_relay.deactivateIME(this);
|
||||
});
|
||||
|
||||
if (!g_pCompositor->m_lastFocus.expired() && g_pCompositor->m_lastFocus->client() == INPUT->client())
|
||||
enter(g_pCompositor->m_lastFocus.lock());
|
||||
if (Desktop::focusState()->surface() && Desktop::focusState()->surface()->client() == INPUT->client())
|
||||
enter(Desktop::focusState()->surface());
|
||||
} else {
|
||||
const auto INPUT = m_v1Input.lock();
|
||||
|
||||
|
|
@ -60,7 +59,7 @@ void CTextInput::onEnabled(SP<CWLSurfaceResource> surfV1) {
|
|||
|
||||
// v1 only, map surface to PTI
|
||||
if (!isV3()) {
|
||||
if (g_pCompositor->m_lastFocus != surfV1 || !m_v1Input->m_active)
|
||||
if (Desktop::focusState()->surface() != surfV1 || !m_v1Input->m_active)
|
||||
return;
|
||||
|
||||
enter(surfV1);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue