Fix moving focus to docks when navigating via keybinds (#7221)

Thorsten Ball , Piotr , and bennetbo created 2 years ago

This is a follow-up to #7141 and fixes the focus-switching to docks in
case they haven't been focused before.

We ran into issues when trying to focus a dock, that hasn't been focused
in the app's lifecycle: focus would only flip after the next re-render
(which could be triggered by moving the mouse, for example)

This changes the approach and uses the one we have for `toggle focus`
actions.

Release Notes:

- N/A

Co-authored-by: Piotr <[e-mail]>
Co-authored-by: bennetbo <[e-mail]>

Change summary

crates/workspace/src/pane_group.rs | 11 +++++++++++
crates/workspace/src/workspace.rs  |  8 +++++++-
2 files changed, 18 insertions(+), 1 deletion(-)

Detailed changes

crates/workspace/src/pane_group.rs

@@ -522,6 +522,17 @@ pub enum SplitDirection {
     Right,
 }
 
+impl std::fmt::Display for SplitDirection {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            SplitDirection::Up => write!(f, "up"),
+            SplitDirection::Down => write!(f, "down"),
+            SplitDirection::Left => write!(f, "left"),
+            SplitDirection::Right => write!(f, "right"),
+        }
+    }
+}
+
 impl SplitDirection {
     pub fn all() -> [Self; 4] {
         [Self::Up, Self::Down, Self::Left, Self::Right]

crates/workspace/src/workspace.rs

@@ -2152,7 +2152,13 @@ impl Workspace {
 
         match target {
             Some(ActivateInDirectionTarget::Pane(pane)) => cx.focus_view(&pane),
-            Some(ActivateInDirectionTarget::Dock(dock)) => cx.focus_view(&dock),
+            Some(ActivateInDirectionTarget::Dock(dock)) => {
+                if let Some(panel) = dock.read(cx).active_panel() {
+                    panel.focus_handle(cx).focus(cx);
+                } else {
+                    log::error!("Could not find a focus target when in switching focus in {direction} direction for a {:?} dock", dock.read(cx).position());
+                }
+            }
             None => {}
         }
     }