From a283c34dbbad44dfddfa4b5eafa6d8e3b47b7c14 Mon Sep 17 00:00:00 2001 From: Winter <102400503+exoess@users.noreply.github.com> Date: Tue, 9 Jul 2024 21:52:48 -0700 Subject: Add move-column-{left/right}-or-to-monitor-{left/right} (#528) * feature added, move-column-left-or-monitor-left and move-column-right-or-monitor-right * fixed stupid mistake * yalter's fixes * fixed names * fixed a stupid mistake --------- Co-authored-by: Ivan Molodetskikh --- src/input/mod.rs | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'src/input') diff --git a/src/input/mod.rs b/src/input/mod.rs index d96de0cb..148129cf 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -571,6 +571,40 @@ impl State { // FIXME: granular self.niri.queue_redraw_all(); } + Action::MoveColumnLeftOrToMonitorLeft => { + if let Some(output) = self.niri.output_left() { + if self.niri.layout.move_column_left_or_to_output(&output) + && !self.maybe_warp_cursor_to_focus_centered() + { + self.move_cursor_to_output(&output); + } else { + self.maybe_warp_cursor_to_focus(); + } + } else { + self.niri.layout.move_left(); + self.maybe_warp_cursor_to_focus(); + } + + // FIXME: granular + self.niri.queue_redraw_all(); + } + Action::MoveColumnRightOrToMonitorRight => { + if let Some(output) = self.niri.output_right() { + if self.niri.layout.move_column_right_or_to_output(&output) + && !self.maybe_warp_cursor_to_focus_centered() + { + self.move_cursor_to_output(&output); + } else { + self.maybe_warp_cursor_to_focus(); + } + } else { + self.niri.layout.move_right(); + self.maybe_warp_cursor_to_focus(); + } + + // FIXME: granular + self.niri.queue_redraw_all(); + } Action::MoveWindowDown => { self.niri.layout.move_down(); self.maybe_warp_cursor_to_focus(); -- cgit