Skip to content

layout/scrolling: fix viewport bug when moving window to another workspace #15141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
erstarr wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −11
Draft

layout/scrolling: fix viewport bug when moving window to another workspace #15141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
401cc34
add new focus reason
erstarr Jun 16, 2026
8d5f63a
rename some focus reasons, group them logically, add a new focus reas…
erstarr Jun 18, 2026
c3ff8b8
rename
erstarr Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/config/shared/actions/ConfigActions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ ActionResult Actions::moveToWorkspace(PHLWORKSPACE ws, bool silent, std::optiona
if (const auto PATCOORDS =
g_pCompositor->vectorToWindowUnified(OLDMIDDLE, Desktop::View::RESERVED_EXTENTS | Desktop::View::INPUT_EXTENTS | Desktop::View::ALLOW_FLOATING, window);
PATCOORDS)
Desktop::focusState()->fullWindowFocus(PATCOORDS, Desktop::FOCUS_REASON_KEYBIND);
Desktop::focusState()->fullWindowFocus(PATCOORDS, Desktop::FOCUS_REASON_FOCUS_FALLBACK_MOVE_WINDOW_TO_WORKSPACE);
else
g_pInputManager->refocus();
}
Expand All @@ -342,7 +342,7 @@ ActionResult Actions::moveToWorkspace(PHLWORKSPACE ws, bool silent, std::optiona

pMonitor->changeWorkspace(ws);

Desktop::focusState()->fullWindowFocus(window, Desktop::FOCUS_REASON_KEYBIND);
Desktop::focusState()->fullWindowFocus(window, Desktop::FOCUS_REASON_MOVE_WINDOW_TO_WORKSPACE);
window->warpCursor();
}

Expand Down
4 changes: 2 additions & 2 deletions src/desktop/state/FocusState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,6 @@ void CFocusState::resetWindowFocus() {
}

bool Desktop::isHardInputFocusReason(eFocusReason r) {
return r == FOCUS_REASON_NEW_WINDOW || r == FOCUS_REASON_KEYBIND || r == FOCUS_REASON_GHOSTS || r == FOCUS_REASON_CLICK || r == FOCUS_REASON_DESKTOP_STATE_CHANGE ||
r == FOCUS_REASON_UNMAP_WINDOW_TILING || r == FOCUS_REASON_SWITCH_TO_WINDOW_HARD;
return r == FOCUS_REASON_MOVE_WINDOW_TO_WORKSPACE || r == FOCUS_REASON_NEW_WINDOW || r == FOCUS_REASON_KEYBIND || r == FOCUS_REASON_GHOSTS || r == FOCUS_REASON_CLICK ||
r == FOCUS_REASON_DESKTOP_STATE_CHANGE || r == FOCUS_REASON_FOCUS_FALLBACK_UNMAP_WINDOW_TILING || r == FOCUS_REASON_SWITCH_TO_WINDOW_HARD;
}
12 changes: 7 additions & 5 deletions src/desktop/state/FocusState.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,23 @@ namespace Desktop {
FOCUS_REASON_UNKNOWN = 0,
FOCUS_REASON_FFM,
FOCUS_REASON_KEYBIND,
FOCUS_REASON_DESKTOP_STATE_CHANGE,
FOCUS_REASON_DISPATCH_FOCUSWINDOW,
FOCUS_REASON_DISPATCH_MOVEWINDOWINTOGROUP,
FOCUS_REASON_CLICK,
FOCUS_REASON_OTHER,
FOCUS_REASON_DESKTOP_STATE_CHANGE,
FOCUS_REASON_SWITCH_TO_WINDOW_SOFT,
FOCUS_REASON_SWITCH_TO_WINDOW_HARD,
FOCUS_REASON_GROUP_CURRENT_WINDOW_CHANGE,
FOCUS_REASON_WORKSPACE_CHANGE,
FOCUS_REASON_TOGGLE_SPECIAL_WORKSPACE,
FOCUS_REASON_UNMAP_WINDOW_TILING,
FOCUS_REASON_UNMAP_WINDOW_FLOATING,
FOCUS_REASON_UNMAP_GROUPED_WINDOW,
FOCUS_REASON_MOVE_WINDOW_TO_WORKSPACE,
FOCUS_REASON_FOCUS_FALLBACK_MOVE_WINDOW_TO_WORKSPACE,
FOCUS_REASON_FOCUS_FALLBACK_UNMAP_WINDOW_TILING,
FOCUS_REASON_FOCUS_FALLBACK_UNMAP_WINDOW_FLOATING,
FOCUS_REASON_FOCUS_FALLBACK_UNMAP_GROUPED_WINDOW,
FOCUS_REASON_NEW_WINDOW,
FOCUS_REASON_GHOSTS,
FOCUS_REASON_OTHER,
};

bool isHardInputFocusReason(eFocusReason r);
Expand Down
5 changes: 3 additions & 2 deletions src/desktop/view/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2581,9 +2581,10 @@ void CWindow::unmapWindow() {

if (candidate != Desktop::focusState()->window() && candidate) {
if (candidate == nextInGroup)
Desktop::focusState()->rawWindowFocus(candidate, FOCUS_REASON_UNMAP_GROUPED_WINDOW);
Desktop::focusState()->rawWindowFocus(candidate, FOCUS_REASON_FOCUS_FALLBACK_UNMAP_GROUPED_WINDOW);
else
Desktop::focusState()->fullWindowFocus(candidate, m_self->m_isFloating ? FOCUS_REASON_UNMAP_WINDOW_FLOATING : FOCUS_REASON_UNMAP_WINDOW_TILING);
Desktop::focusState()->fullWindowFocus(candidate,
m_self->m_isFloating ? FOCUS_REASON_FOCUS_FALLBACK_UNMAP_WINDOW_FLOATING : FOCUS_REASON_FOCUS_FALLBACK_UNMAP_WINDOW_TILING);

if ((*PEXITRETAINSFS || candidate == nextInGroup) && CURRENTWINDOWFSSTATE)
g_pCompositor->setWindowFullscreenInternal(candidate, CURRENTFSMODE);
Expand Down
Loading