Skip to content

Follow focus on up/down and column moves to workspace #489

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

Merged
BarutSRB merged 13 commits into from
Jul 17, 2026
Merged

Follow focus on up/down and column moves to workspace #489

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a640f0b
Update SwiftFormat to 0.62.1
BarutSRB Jul 16, 2026
6d0dd89
Move running-app inventory into Core
BarutSRB Jul 16, 2026
fbf8d0f
Bound AX full-rescan discovery
BarutSRB Jul 16, 2026
5ec60b9
Harden window admission identity lifecycle
BarutSRB Jul 16, 2026
348232a
Handle terminal AX frame refusals
BarutSRB Jul 16, 2026
3f3d2fb
Add structured window-admission tracing
BarutSRB Jul 16, 2026
58580ab
Correlate issue reports with diagnostic artifacts
BarutSRB Jul 16, 2026
b35d39d
Follow focus on up/down and column moves to workspace
RyanHecht Jul 16, 2026
9064f50
Address review: drop redundant session patch, always stop source scroll
RyanHecht Jul 16, 2026
1ccee8b
Complete window admission reliability hardening
BarutSRB Jul 17, 2026
cdf5d38
Release 0.5.7
BarutSRB Jul 17, 2026
6d51692
Honor follow focus for workspace moves
BarutSRB Jul 17, 2026
6699b11
Integrate PR #489 follow-focus history
BarutSRB Jul 17, 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
99 changes: 69 additions & 30 deletions Sources/OmniWM/Core/Controller/WorkspaceNavigationHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,60 @@ final class WorkspaceNavigationHandler {
return ids
}

/// Completes a window/column workspace transfer, either following focus to the
/// destination workspace or staying on the source, based on the
/// `focusFollowsWindowToMonitor` setting. Mirrors the follow/stay branching of
/// `moveFocusedWindow(toRawWorkspaceID:)` so all move-to-workspace operations behave
/// consistently under the same toggle.
private func finishWorkspaceMove(
followToken: WindowToken,
sourceWorkspaceId: WorkspaceDescriptor.ID,
mutation: StructuralMutation
) {
guard let controller else { return }

if controller.settings.focusFollowsWindowToMonitor {
controller.isTransferringWindow = true
defer { controller.isTransferringWindow = false }

let destinationWorkspaceId = mutation.destinationWorkspaceId
if let targetMonitor = controller.workspaceManager.monitorForWorkspace(destinationWorkspaceId) {
_ = controller.workspaceManager.setActiveWorkspace(destinationWorkspaceId, on: targetMonitor.id)
}

if let sourceMonitor = controller.workspaceManager.monitor(for: sourceWorkspaceId) {
controller.layoutRefreshController.stopScrollAnimation(for: sourceMonitor.displayId)
}

applySessionPatch(
workspaceId: destinationWorkspaceId,
viewportState: transferredWindowNiriViewportState(
token: followToken,
workspaceId: destinationWorkspaceId
),
rememberedFocusToken: followToken
)

controller.layoutRefreshController.commitWorkspaceTransition(
affectedWorkspaces: mutation.affectedWorkspaceIds,
reason: .workspaceTransition
) { [weak controller] in
controller?.focusWindow(followToken)
}
} else {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
let focusToken = controller.resolveAndSetWorkspaceFocusToken(for: sourceWorkspaceId)

controller.layoutRefreshController.commitWorkspaceTransition(
affectedWorkspaces: mutation.affectedWorkspaceIds,
reason: .workspaceTransition
) { [weak controller] in
if let focusToken {
controller?.focusWindow(focusToken)
}
}
}
}

private func recoverSourceFocus(
after transfer: WindowTransferResult,
from workspaceId: WorkspaceDescriptor.ID
Expand Down Expand Up @@ -782,16 +836,11 @@ final class WorkspaceNavigationHandler {
direction: direction
) else { return }

let focusToken = controller.resolveAndSetWorkspaceFocusToken(for: sourceWorkspaceId)

controller.layoutRefreshController.commitWorkspaceTransition(
affectedWorkspaces: mutation.affectedWorkspaceIds,
reason: .workspaceTransition
) { [weak controller] in
if let focusToken {
controller?.focusWindow(focusToken)
}
}
finishWorkspaceMove(
followToken: token,
sourceWorkspaceId: sourceWorkspaceId,
mutation: mutation
)
}

func moveColumnToAdjacentWorkspace(direction: Direction) {
Expand All @@ -805,16 +854,11 @@ final class WorkspaceNavigationHandler {
direction: direction
) else { return }

let focusToken = controller.resolveAndSetWorkspaceFocusToken(for: sourceWorkspaceId)

controller.layoutRefreshController.commitWorkspaceTransition(
affectedWorkspaces: mutation.affectedWorkspaceIds,
reason: .workspaceTransition
) { [weak controller] in
if let focusToken {
controller?.focusWindow(focusToken)
}
}
finishWorkspaceMove(
followToken: token,
sourceWorkspaceId: sourceWorkspaceId,
mutation: mutation
)
}

func moveColumnToWorkspaceByIndex(index: Int) {
Expand All @@ -838,16 +882,11 @@ final class WorkspaceNavigationHandler {
toWorkspaceId: targetWorkspaceId
) else { return }

let focusToken = controller.resolveAndSetWorkspaceFocusToken(for: sourceWorkspaceId)

controller.layoutRefreshController.commitWorkspaceTransition(
affectedWorkspaces: mutation.affectedWorkspaceIds,
reason: .workspaceTransition
) { [weak controller] in
if let focusToken {
controller?.focusWindow(focusToken)
}
}
finishWorkspaceMove(
followToken: token,
sourceWorkspaceId: sourceWorkspaceId,
mutation: mutation
)
}

func moveFocusedWindow(toWorkspaceIndex index: Int) {
Expand Down