From 14b1003c627cb6ceddfb29ef3298e0b9481f91e6 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 15 Dec 2024 10:30:32 +0300 Subject: layout: Implement focus_right_or_first() generically --- src/layout/workspace.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/layout/workspace.rs') 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 Workspace { } 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 { -- cgit