Fix focus=false for move-column-to-workspace*, add to move-window-to-workspace-up/down

This commit is contained in:
gibberish
2025-06-16 17:23:29 +07:00
committed by Ivan Molodetskikh
parent f6f4bf97c3
commit e038b8770a
8 changed files with 122 additions and 41 deletions
+8 -4
View File
@@ -1844,8 +1844,8 @@ pub enum Action {
FocusWorkspaceUpUnderMouse,
FocusWorkspace(#[knuffel(argument)] WorkspaceReference),
FocusWorkspacePrevious,
MoveWindowToWorkspaceDown,
MoveWindowToWorkspaceUp,
MoveWindowToWorkspaceDown(#[knuffel(property(name = "focus"), default = true)] bool),
MoveWindowToWorkspaceUp(#[knuffel(property(name = "focus"), default = true)] bool),
MoveWindowToWorkspace(
#[knuffel(argument)] WorkspaceReference,
#[knuffel(property(name = "focus"), default = true)] bool,
@@ -2089,8 +2089,12 @@ impl From<niri_ipc::Action> for Action {
Self::FocusWorkspace(WorkspaceReference::from(reference))
}
niri_ipc::Action::FocusWorkspacePrevious {} => Self::FocusWorkspacePrevious,
niri_ipc::Action::MoveWindowToWorkspaceDown {} => Self::MoveWindowToWorkspaceDown,
niri_ipc::Action::MoveWindowToWorkspaceUp {} => Self::MoveWindowToWorkspaceUp,
niri_ipc::Action::MoveWindowToWorkspaceDown { focus } => {
Self::MoveWindowToWorkspaceDown(focus)
}
niri_ipc::Action::MoveWindowToWorkspaceUp { focus } => {
Self::MoveWindowToWorkspaceUp(focus)
}
niri_ipc::Action::MoveWindowToWorkspace {
window_id: None,
reference,