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

Checkpoint

Browse source
This commit is contained in:
Antonio Scandurra 2023-09-26 11:34:41 -06:00
parent 04d3ea9563
commit bfe2205ecb
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/gpui3/src/app.rs
View file

@ -97,7 +97,7 @@ impl AppContext {
let this = self.this.upgrade().unwrap();
self.platform.read(move |platform| {
let cx = &mut *this.lock();
f(platform, cx)
cx.update(|cx| f(platform, cx))
})
}
@ -122,22 +122,24 @@ impl AppContext {
id: WindowId,
update: impl FnOnce(&mut WindowContext) -> R,
) -> Result<R> {
let mut window = self
.windows
.get_mut(id)
.ok_or_else(|| anyhow!("window not found"))?
.take()
.unwrap();
self.update(|cx| {
let mut window = cx
.windows
.get_mut(id)
.ok_or_else(|| anyhow!("window not found"))?
.take()
.unwrap();
let result = update(&mut WindowContext::mutable(self, &mut window));
window.dirty = true;
let result = update(&mut WindowContext::mutable(cx, &mut window));
window.dirty = true;
self.windows
.get_mut(id)
.ok_or_else(|| anyhow!("window not found"))?
.replace(window);
cx.windows
.get_mut(id)
.ok_or_else(|| anyhow!("window not found"))?
.replace(window);
Ok(result)
Ok(result)
})
}
fn update<R>(&mut self, update: impl FnOnce(&mut Self) -> R) -> R {