diff options
| author | MightyPlaza <123664421+MightyPlaza@users.noreply.github.com> | 2024-03-28 02:08:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 02:08:21 +0000 |
| commit | c24034eb9d33f104f9e1f9016d93a2600dba2a92 (patch) | |
| tree | fdff839cc1a364b5eb01cc23c6d1d04091cc7bb5 /src/Compositor.cpp | |
| parent | 0869f65b0b7e13b0d7f522decfc21244beb21c3a (diff) | |
core: fix fullscreen + floating focus change (#5291)
modified: src/Compositor.cpp
Diffstat (limited to 'src/Compositor.cpp')
| -rw-r--r-- | src/Compositor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 68db0091..2e49237c 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1568,7 +1568,7 @@ CWindow* CCompositor::getWindowInDirection(CWindow* pWindow, char dir) { // for tiled windows, we calc edges for (auto& w : m_vWindows) { - if (w.get() == pWindow || !w->m_bIsMapped || w->isHidden() || w->m_bIsFloating || !isWorkspaceVisible(w->m_iWorkspaceID)) + if (w.get() == pWindow || !w->m_bIsMapped || w->isHidden() || (!w->m_bIsFullscreen && w->m_bIsFloating) || !isWorkspaceVisible(w->m_iWorkspaceID)) continue; if (pWindow->m_iMonitorID == w->m_iMonitorID && pWindow->m_iWorkspaceID != w->m_iWorkspaceID) @@ -1657,7 +1657,7 @@ CWindow* CCompositor::getWindowInDirection(CWindow* pWindow, char dir) { constexpr float THRESHOLD = 0.3 * M_PI; for (auto& w : m_vWindows) { - if (w.get() == pWindow || !w->m_bIsMapped || w->isHidden() || !w->m_bIsFloating || !isWorkspaceVisible(w->m_iWorkspaceID)) + if (w.get() == pWindow || !w->m_bIsMapped || w->isHidden() || (!w->m_bIsFullscreen && !w->m_bIsFloating) || !isWorkspaceVisible(w->m_iWorkspaceID)) continue; if (pWindow->m_iMonitorID == w->m_iMonitorID && pWindow->m_iWorkspaceID != w->m_iWorkspaceID) |