From e038b8770a17b67cbf9c9d007a1f3a9ac0b53c60 Mon Sep 17 00:00:00 2001 From: gibberish Date: Mon, 16 Jun 2025 17:23:29 +0700 Subject: Fix focus=false for move-column-to-workspace*, add to move-window-to-workspace-up/down --- src/ui/hotkey_overlay.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ui') 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"), -- cgit