diff options
| author | gibberish <gbjgms@gmail.com> | 2025-06-16 17:23:29 +0700 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-08-27 09:17:58 +0300 |
| commit | e038b8770a17b67cbf9c9d007a1f3a9ac0b53c60 (patch) | |
| tree | 3a23444922e8b794ecb584374b39e71c2c661caf /src/ui | |
| parent | f6f4bf97c368d9a8539137896f786291d859cadf (diff) | |
| download | niri-e038b8770a17b67cbf9c9d007a1f3a9ac0b53c60.tar.gz niri-e038b8770a17b67cbf9c9d007a1f3a9ac0b53c60.tar.bz2 niri-e038b8770a17b67cbf9c9d007a1f3a9ac0b53c60.zip | |
Fix focus=false for move-column-to-workspace*, add to move-window-to-workspace-up/down
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/hotkey_overlay.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/hotkey_overlay.rs b/src/ui/hotkey_overlay.rs index 6b7a4cd4..783b71ef 100644 --- a/src/ui/hotkey_overlay.rs +++ b/src/ui/hotkey_overlay.rs @@ -228,9 +228,9 @@ fn collect_actions(config: &Config) -> Vec<&Action> { actions.push(&bind.action); } else if binds .iter() - .any(|bind| matches!(bind.action, Action::MoveWindowToWorkspaceDown)) + .any(|bind| matches!(bind.action, Action::MoveWindowToWorkspaceDown(_))) { - actions.push(&Action::MoveWindowToWorkspaceDown); + actions.push(&Action::MoveWindowToWorkspaceDown(true)); } else { actions.push(&Action::MoveColumnToWorkspaceDown(true)); } @@ -243,9 +243,9 @@ fn collect_actions(config: &Config) -> Vec<&Action> { actions.push(&bind.action); } else if binds .iter() - .any(|bind| matches!(bind.action, Action::MoveWindowToWorkspaceUp)) + .any(|bind| matches!(bind.action, Action::MoveWindowToWorkspaceUp(_))) { - actions.push(&Action::MoveWindowToWorkspaceUp); + actions.push(&Action::MoveWindowToWorkspaceUp(true)); } else { actions.push(&Action::MoveColumnToWorkspaceUp(true)); } @@ -468,8 +468,8 @@ fn action_name(action: &Action) -> String { Action::FocusWorkspaceUp => String::from("Switch Workspace Up"), Action::MoveColumnToWorkspaceDown(_) => String::from("Move Column to Workspace Down"), Action::MoveColumnToWorkspaceUp(_) => String::from("Move Column to Workspace Up"), - Action::MoveWindowToWorkspaceDown => String::from("Move Window to Workspace Down"), - Action::MoveWindowToWorkspaceUp => String::from("Move Window to Workspace Up"), + Action::MoveWindowToWorkspaceDown(_) => String::from("Move Window to Workspace Down"), + Action::MoveWindowToWorkspaceUp(_) => String::from("Move Window to Workspace Up"), Action::SwitchPresetColumnWidth => String::from("Switch Preset Column Widths"), Action::MaximizeColumn => String::from("Maximize Column"), Action::ConsumeOrExpelWindowLeft => String::from("Consume or Expel Window Left"), |