layout: Implement focus_right_or_first() generically

2 files changed, 4 insertions, 30 deletions

diff --git a/src/layout/scrolling.rs b/src/layout/scrolling.rs
index a3b22360..83c597aa 100644
--- a/src/layout/scrolling.rs
+++ b/src/layout/scrolling.rs
@@ -1316,28 +1316,6 @@ impl<W: LayoutElement> ScrollingSpace<W> {
         self.activate_column(self.columns.len() - 1);
     }
 
-    pub fn focus_column_right_or_first(&mut self) {
-        if self.columns.is_empty() {
-            return;
-        }
-
-        let column_idx = (self.active_column_idx + 1) % self.columns.len();
-        self.activate_column(column_idx);
-    }
-
-    pub fn focus_column_left_or_last(&mut self) {
-        if self.columns.is_empty() {
-            return;
-        }
-
-        let column_idx = if self.active_column_idx == 0 {
-            self.columns.len() - 1
-        } else {
-            self.active_column_idx - 1
-        };
-        self.activate_column(column_idx);
-    }
-
     pub fn focus_down(&mut self) -> bool {
         if self.columns.is_empty() {
             return false;
diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs
index 9ad72cd1..3b3e28ee 100644
--- a/src/layout/workspace.rs
+++ b/src/layout/workspace.rs
@@ -779,19 +779,15 @@ impl<W: LayoutElement> Workspace<W> {
     }
 
     pub fn focus_column_right_or_first(&mut self) {
-        // TODO
-        if self.floating_is_active {
-            return;
+        if !self.focus_right() {
+            self.focus_column_first();
         }
-        self.scrolling.focus_column_right_or_first();
     }
 
     pub fn focus_column_left_or_last(&mut self) {
-        // TODO
-        if self.floating_is_active {
-            return;
+        if !self.focus_left() {
+            self.focus_column_last();
         }
-        self.scrolling.focus_column_left_or_last();
     }
 
     pub fn focus_down(&mut self) -> bool {