diff options
| author | vaxerski <vaxry@vaxry.net> | 2022-08-14 16:39:56 +0200 |
|---|---|---|
| committer | vaxerski <vaxry@vaxry.net> | 2022-08-14 16:39:56 +0200 |
| commit | 28867758c486b12ebe387d72bba2be67a7dc8a2a (patch) | |
| tree | 1a02e1cb300a731681fe15951892eea0eee844bc | |
| parent | 920727cbbaf8e8f244bb60f3731148773924034e (diff) | |
better fix the last fix
| -rw-r--r-- | src/Compositor.cpp | 4 | ||||
| -rw-r--r-- | src/layout/DwindleLayout.cpp | 3 | ||||
| -rw-r--r-- | src/layout/MasterLayout.cpp | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 25405666..6ddd7f90 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1411,9 +1411,7 @@ void CCompositor::setWindowFullscreen(CWindow* pWindow, bool on, eFullscreenMode if (!windowValidMapped(pWindow)) return; - if (!isWorkspaceVisible(pWindow->m_iWorkspaceID)) { - g_pKeybindManager->changeworkspace("[internal]" + std::to_string(pWindow->m_iWorkspaceID)); - } + focusWindow(pWindow); g_pLayoutManager->getCurrentLayout()->fullscreenRequestForWindow(pWindow, mode, on); diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index 192fe7c2..15388bf3 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -628,6 +628,9 @@ void CHyprDwindleLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscree if (!g_pCompositor->windowValidMapped(pWindow)) return; + if (!g_pCompositor->isWorkspaceVisible(pWindow->m_iWorkspaceID)) + return; + if (on == pWindow->m_bIsFullscreen) return; // ignore diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp index 1f647c63..71c65125 100644 --- a/src/layout/MasterLayout.cpp +++ b/src/layout/MasterLayout.cpp @@ -320,6 +320,9 @@ void CHyprMasterLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscreen if (!g_pCompositor->windowValidMapped(pWindow)) return; + if (!g_pCompositor->isWorkspaceVisible(pWindow->m_iWorkspaceID)) + return; + if (on == pWindow->m_bIsFullscreen) return; // ignore |