mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-07 02:57:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Capture node in dispatch tree even if it's not focusable

Browse source
This commit is contained in:
Antonio Scandurra 2023-11-13 14:42:16 +01:00
parent 26d26fadb3
commit 827b16bf5c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/gpui2/src/key_dispatch.rs
View file

@ -305,7 +305,7 @@ pub trait KeyDispatch<V: 'static>: 'static {
cx: &mut ViewContext<V>, cx: &mut ViewContext<V>,
f: impl FnOnce(Option<FocusHandle>, &mut ViewContext<V>) -> R, f: impl FnOnce(Option<FocusHandle>, &mut ViewContext<V>) -> R,
) -> R { ) -> R {
if let Some(focusable) = self.as_focusable_mut() { let focus_handle = if let Some(focusable) = self.as_focusable_mut() {
let focus_handle = focusable let focus_handle = focusable
.focus_handle .focus_handle
.get_or_insert_with(|| focus_handle.unwrap_or_else(|| cx.focus_handle())) .get_or_insert_with(|| focus_handle.unwrap_or_else(|| cx.focus_handle()))
@ -316,11 +316,12 @@ pub trait KeyDispatch<V: 'static>: 'static {
listener(view, &focus_handle, event, cx) listener(view, &focus_handle, event, cx)
}); });
} }
Some(focus_handle)
cx.with_key_dispatch(self.key_context().clone(), Some(focus_handle), f)
} else { } else {
f(None, cx) None
} };
cx.with_key_dispatch(self.key_context().clone(), focus_handle, f)
} }
fn refine_style(&self, style: &mut Style, cx: &WindowContext) { fn refine_style(&self, style: &mut Style, cx: &WindowContext) {