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

Use AppContext::update when updating windows so we handle effects

Browse source
This commit is contained in:
Nathan Sobo 2023-08-08 17:20:46 -06:00
parent 8e49d1419a
commit fc96676662
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/gpui/src/app.rs
View file

@ -2112,13 +2112,15 @@ impl BorrowWindowContext for AppContext {
where where
F: FnOnce(&mut WindowContext) -> T, F: FnOnce(&mut WindowContext) -> T,
{ {
let mut window = self.windows.remove(&handle)?; self.update(|cx| {
let mut window_context = WindowContext::mutable(self, &mut window, handle); let mut window = cx.windows.remove(&handle)?;
let result = f(&mut window_context); let mut window_context = WindowContext::mutable(cx, &mut window, handle);
if !window_context.removed { let result = f(&mut window_context);
self.windows.insert(handle, window); if !window_context.removed {
} cx.windows.insert(handle, window);
Some(result) }
Some(result)
})
} }
fn update_window_optional<T, F>(&mut self, handle: AnyWindowHandle, f: F) -> Option<T> fn update_window_optional<T, F>(&mut self, handle: AnyWindowHandle, f: F) -> Option<T>