Fix focus issues with gpui2 docks (#3606)

* Fixed dock toggling not focusing the terminal element
* Fixed loosing focus on dock close (e.g. cmd-d on the last terminal in
the dock)
* Removed element stateless focus API since it would not work when the
element is not rendered, update all API usages to the stateful one via
`gpui::Subscription`

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov
2023-12-12 17:26:39 +02:00
committed by GitHub
10 changed files with 158 additions and 161 deletions
+1
View File
@@ -346,6 +346,7 @@ impl Dock {
})
.ok();
}
// todo!() we do not use this event in the production code (even in zed1), remove it
PanelEvent::Activate => {
if let Some(ix) = this
.panel_entries
+11 -14
View File
@@ -10,7 +10,7 @@ use gpui::{
actions, impl_actions, overlay, prelude::*, rems, Action, AnchorCorner, AnyWeakView,
AppContext, AsyncWindowContext, DismissEvent, Div, EntityId, EventEmitter, FocusHandle,
Focusable, FocusableView, Model, MouseButton, NavigationDirection, Pixels, Point, PromptLevel,
Render, Task, View, ViewContext, VisualContext, WeakView, WindowContext,
Render, Subscription, Task, View, ViewContext, VisualContext, WeakView, WindowContext,
};
use parking_lot::Mutex;
use project::{Project, ProjectEntryId, ProjectPath};
@@ -188,6 +188,7 @@ pub struct Pane {
// can_drop: Rc<dyn Fn(&DragAndDrop<Workspace>, &WindowContext) -> bool>,
can_split: bool,
// render_tab_bar_buttons: Rc<dyn Fn(&mut Pane, &mut ViewContext<Pane>) -> AnyElement<Pane>>,
subscriptions: Vec<Subscription>,
}
pub struct ItemNavHistory {
@@ -326,10 +327,17 @@ impl Pane {
// context_menu.update(cx, |menu, _| {
// menu.set_position_mode(OverlayPositionMode::Local)
// });
//
let focus_handle = cx.focus_handle();
let subscriptions = vec![
cx.on_focus_in(&focus_handle, move |this, cx| this.focus_in(cx)),
cx.on_focus_out(&focus_handle, move |this, cx| this.focus_out(cx)),
];
let handle = cx.view().downgrade();
Self {
focus_handle: cx.focus_handle(),
focus_handle,
items: Vec::new(),
activation_history: Vec::new(),
was_focused: false,
@@ -416,6 +424,7 @@ impl Pane {
// })
// .into_any()
// }),
subscriptions,
}
}
@@ -2098,18 +2107,6 @@ impl Render for Pane {
.track_focus(&self.focus_handle)
.size_full()
.overflow_hidden()
.on_focus_in({
let this = this.clone();
move |event, cx| {
this.update(cx, |this, cx| this.focus_in(cx)).ok();
}
})
.on_focus_out({
let this = this.clone();
move |event, cx| {
this.update(cx, |this, cx| this.focus_out(cx)).ok();
}
})
.on_action(cx.listener(|pane, _: &SplitLeft, cx| pane.split(SplitDirection::Left, cx)))
.on_action(cx.listener(|pane, _: &SplitUp, cx| pane.split(SplitDirection::Up, cx)))
.on_action(
+6
View File
@@ -532,6 +532,11 @@ impl Workspace {
cx.notify()
})
.detach();
cx.on_blur_window(|this, cx| {
let focus_handle = this.focus_handle(cx);
cx.focus(&focus_handle);
})
.detach();
let weak_handle = cx.view().downgrade();
let pane_history_timestamp = Arc::new(AtomicUsize::new(0));
@@ -1633,6 +1638,7 @@ impl Workspace {
panel.focus_handle(cx).focus(cx);
reveal_dock = true;
} else {
// todo!()
// if panel.is_zoomed(cx) {
// dock.set_open(false, cx);
// }