hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 10:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

change workspace in focusWindow if necessary

Browse source
This commit is contained in:
Vaxry 2022-08-06 21:05:19 +02:00
parent 1b109d9242
commit 68fd97fae9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Compositor.cpp
View file

@ -624,6 +624,9 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) {
if (m_pLastWindow == pWindow && m_sSeat.seat->keyboard_state.focused_surface == pSurface) if (m_pLastWindow == pWindow && m_sSeat.seat->keyboard_state.focused_surface == pSurface)
return; return;
if (!isWorkspaceVisible(pWindow->m_iWorkspaceID))
g_pKeybindManager->changeworkspace("[internal]" + std::to_string(pWindow->m_iWorkspaceID));
const auto PLASTWINDOW = m_pLastWindow; const auto PLASTWINDOW = m_pLastWindow;
m_pLastWindow = pWindow; m_pLastWindow = pWindow;
@ -1549,10 +1552,10 @@ void CCompositor::closeWindow(CWindow* pWindow) {
g_pXWaylandManager->sendCloseWindow(pWindow); g_pXWaylandManager->sendCloseWindow(pWindow);
if (pWindow == m_pLastWindow) { if (pWindow == m_pLastWindow) {
g_pCompositor->m_pLastFocus = nullptr; m_pLastFocus = nullptr;
g_pCompositor->m_pLastWindow = nullptr; m_pLastWindow = nullptr;
g_pEventManager->postEvent(SHyprIPCEvent{"activewindow", ","}); // post an activewindow event to empty, as we are currently unfocused g_pEventManager->postEvent(SHyprIPCEvent{"activewindow", ","}); // post an activewindow event to empty, as we are currently unfocused
g_pCompositor->focusWindow(g_pCompositor->windowFromCursor()); focusWindow(windowFromCursor());
} }
} }
} }