Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix panic when calling with_key_dispatch recursively

Browse source 
Co-Authored-By: Thorsten <mrnugget@gmail.com>
This commit is contained in:
Antonio Scandurra 2023-11-13 10:17:52 +01:00
parent 7eaba8fabc
commit 318cb784b2
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/gpui2/src/window.rs
View file

@ -1889,18 +1889,18 @@ impl<'a, V: 'static> ViewContext<'a, V> {
focus_handle: Option<FocusHandle>, focus_handle: Option<FocusHandle>,
f: impl FnOnce(Option<FocusHandle>, &mut Self) -> R, f: impl FnOnce(Option<FocusHandle>, &mut Self) -> R,
) -> R { ) -> R {
let mut old_dispatcher = self.window.previous_frame.key_dispatcher.take().unwrap(); let window = &mut self.window;
let mut current_dispatcher = self.window.current_frame.key_dispatcher.take().unwrap(); let old_dispatcher = window.previous_frame.key_dispatcher.as_mut().unwrap();
let current_dispatcher = window.current_frame.key_dispatcher.as_mut().unwrap();
current_dispatcher.push_node(context, &mut old_dispatcher); current_dispatcher.push_node(context, old_dispatcher);
if let Some(focus_handle) = focus_handle.as_ref() { if let Some(focus_handle) = focus_handle.as_ref() {
current_dispatcher.make_focusable(focus_handle.id); current_dispatcher.make_focusable(focus_handle.id);
} }
let result = f(focus_handle, self); let result = f(focus_handle, self);
current_dispatcher.pop_node();
self.window.previous_frame.key_dispatcher = Some(old_dispatcher); let current_dispatcher = self.window.current_frame.key_dispatcher.as_mut().unwrap();
self.window.current_frame.key_dispatcher = Some(current_dispatcher); current_dispatcher.pop_node();
result result
} }