From 8eb34b2e185aa0e0affea450226369cd3f9e6a78 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Thu, 29 Aug 2024 15:04:20 +0300 Subject: Animate focus-workspace by idx/back and forth/previous Deleting the test because it only made sense when no-animation was special cased. --- src/layout/mod.rs | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'src/layout/mod.rs') diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 6407c7a1..ac46d5b8 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -1011,7 +1011,7 @@ impl Layout { Some(WorkspaceSwitch::Gesture(gesture)) if gesture.current_idx.floor() == workspace_idx as f64 || gesture.current_idx.ceil() == workspace_idx as f64 => {} - _ => mon.switch_workspace(workspace_idx, true), + _ => mon.switch_workspace(workspace_idx), } break; @@ -1532,7 +1532,7 @@ impl Layout { let Some(monitor) = self.active_monitor() else { return; }; - monitor.switch_workspace(idx, false); + monitor.switch_workspace(idx); } pub fn switch_workspace_auto_back_and_forth(&mut self, idx: usize) { @@ -3776,38 +3776,6 @@ mod tests { assert!(monitors[0].workspaces[0].has_windows()); } - #[test] - fn focus_workspace_by_idx_does_not_leave_empty_workspaces() { - let ops = [ - Op::AddOutput(1), - Op::AddWindow { - id: 0, - bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)), - min_max_size: Default::default(), - }, - Op::FocusWorkspaceDown, - Op::AddWindow { - id: 1, - bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)), - min_max_size: Default::default(), - }, - Op::FocusWorkspaceUp, - Op::CloseWindow(0), - Op::FocusWorkspace(3), - ]; - - let mut layout = Layout::default(); - for op in ops { - op.apply(&mut layout); - } - - let MonitorSet::Normal { monitors, .. } = layout.monitor_set else { - unreachable!() - }; - - assert!(monitors[0].workspaces[0].has_windows()); - } - #[test] fn empty_workspaces_dont_move_back_to_original_output() { let ops = [ -- cgit