diff options
| author | nyx <nnyyxxxx@protonmail.com> | 2025-03-29 02:40:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-29 06:40:08 +0000 |
| commit | 0db48e2f1bf001bfd05c686002ff1998d0f1205b (patch) | |
| tree | afc86c3f1652675750f3c6d0db0c6e0d932d4438 /niri-config/src | |
| parent | 7cfecf4b1b9b8c11c80061fb31926f888228499d (diff) | |
| download | niri-0db48e2f1bf001bfd05c686002ff1998d0f1205b.tar.gz niri-0db48e2f1bf001bfd05c686002ff1998d0f1205b.tar.bz2 niri-0db48e2f1bf001bfd05c686002ff1998d0f1205b.zip | |
Add focus argument to move-window-to-workspace (#1332)
* layout: add focus flag to move-window-to-workspace
* lib: update comment
* misc: minor dup refactor
* input: format code
* layout: minor nit
* layout: update comment
* input: remove unnecessary conditionals
* misc: replace boolean
* tests: fix the failing one
* layout: change to smart
* ipc: Option<bool> -> bool
* lib: format code
* Rewrite focus doc comment
---------
Co-authored-by: Ivan Molodetskikh <yalterz@gmail.com>
Diffstat (limited to 'niri-config/src')
| -rw-r--r-- | niri-config/src/lib.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index db379746..6ae66aeb 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -1592,11 +1592,15 @@ pub enum Action { FocusWorkspacePrevious, MoveWindowToWorkspaceDown, MoveWindowToWorkspaceUp, - MoveWindowToWorkspace(#[knuffel(argument)] WorkspaceReference), + MoveWindowToWorkspace( + #[knuffel(argument)] WorkspaceReference, + #[knuffel(property(name = "focus"), default = true)] bool, + ), #[knuffel(skip)] MoveWindowToWorkspaceById { window_id: u64, reference: WorkspaceReference, + focus: bool, }, MoveColumnToWorkspaceDown, MoveColumnToWorkspaceUp, @@ -1817,13 +1821,16 @@ impl From<niri_ipc::Action> for Action { niri_ipc::Action::MoveWindowToWorkspace { window_id: None, reference, - } => Self::MoveWindowToWorkspace(WorkspaceReference::from(reference)), + focus, + } => Self::MoveWindowToWorkspace(WorkspaceReference::from(reference), focus), niri_ipc::Action::MoveWindowToWorkspace { window_id: Some(window_id), reference, + focus, } => Self::MoveWindowToWorkspaceById { window_id, reference: WorkspaceReference::from(reference), + focus, }, niri_ipc::Action::MoveColumnToWorkspaceDown {} => Self::MoveColumnToWorkspaceDown, niri_ipc::Action::MoveColumnToWorkspaceUp {} => Self::MoveColumnToWorkspaceUp, |