From 6865660e51a3e26ac4dc8a308b8e43781e30a841 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Mon, 29 Aug 2022 14:55:11 +0200 Subject: [PATCH] disable fullscreen and floating dispatchers on special --- src/managers/KeybindManager.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 43993570..901d8174 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -495,11 +495,10 @@ void CKeybindManager::toggleActiveFloating(std::string args) { // remove drag status g_pInputManager->currentlyDraggedWindow = nullptr; - PWINDOW->m_bIsFloating = !PWINDOW->m_bIsFloating; + if (PWINDOW->m_iWorkspaceID == SPECIAL_WORKSPACE_ID) + return; - if (PWINDOW->m_iWorkspaceID == SPECIAL_WORKSPACE_ID && PWINDOW == g_pCompositor->m_pLastWindow) { - moveActiveToWorkspace(std::to_string(g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID)->activeWorkspace)); - } + PWINDOW->m_bIsFloating = !PWINDOW->m_bIsFloating; g_pLayoutManager->getCurrentLayout()->changeWindowFloatingMode(PWINDOW); } @@ -705,6 +704,9 @@ void CKeybindManager::fullscreenActive(std::string args) { if (!g_pCompositor->windowValidMapped(PWINDOW)) return; + if (PWINDOW->m_iWorkspaceID == SPECIAL_WORKSPACE_ID) + return; + g_pCompositor->setWindowFullscreen(PWINDOW, !PWINDOW->m_bIsFullscreen, args == "1" ? FULLSCREEN_MAXIMIZED : FULLSCREEN_FULL); }