From d6b62ad09d049524b5c734f90ea86f6252d32088 Mon Sep 17 00:00:00 2001
From: Matt Cuneo <m@cuneo.au>
Date: Tue, 19 Dec 2023 19:25:05 +1100
Subject: Add optional fallback to workspace focus/move for window focus/move
 (#93)

* Add optional fallback to workspace focus/move for window focus/move commands

* Refactored to separate commands

* fix indentation

* fix white space

* Stylistic fixes

---------

Co-authored-by: Ivan Molodetskikh <yalterz@gmail.com>
---
 src/input.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/input.rs')

diff --git a/src/input.rs b/src/input.rs
index 6532f4a5..f84b8465 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -339,6 +339,16 @@ impl State {
                 // FIXME: granular
                 self.niri.queue_redraw_all();
             }
+            Action::MoveWindowDownOrToWorkspaceDown => {
+                self.niri.layout.move_down_or_to_workspace_down();
+                // FIXME: granular
+                self.niri.queue_redraw_all();
+            }
+            Action::MoveWindowUpOrToWorkspaceUp => {
+                self.niri.layout.move_up_or_to_workspace_up();
+                // FIXME: granular
+                self.niri.queue_redraw_all();
+            }
             Action::FocusColumnLeft => {
                 self.niri.layout.focus_left();
             }
@@ -351,6 +361,16 @@ impl State {
             Action::FocusWindowUp => {
                 self.niri.layout.focus_up();
             }
+            Action::FocusWindowOrWorkspaceDown => {
+                self.niri.layout.focus_window_or_workspace_down();
+                // FIXME: granular
+                self.niri.queue_redraw_all();
+            }
+            Action::FocusWindowOrWorkspaceUp => {
+                self.niri.layout.focus_window_or_workspace_up();
+                // FIXME: granular
+                self.niri.queue_redraw_all();
+            }
             Action::MoveWindowToWorkspaceDown => {
                 self.niri.layout.move_to_workspace_down();
                 // FIXME: granular
-- 
cgit