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-10-11 09:17:25 +02:00
parent f1cc62c21f
commit 0fb7364235
5 changed files with 27 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/gpui3/src/window.rs
View file

@ -606,8 +606,9 @@ impl<'a, 'w> WindowContext<'a, 'w> {
};
cx.window.root_view = Some(root_view);
let scene = cx.window.scene_builder.build();
cx.end_frame();
cx.run_on_main(view, |_, cx| {
cx.window
.platform_window
@ -650,6 +651,10 @@ impl<'a, 'w> WindowContext<'a, 'w> {
.for_each(Vec::clear);
}
fn end_frame(&mut self) {
self.text_system().end_frame();
}
fn dispatch_event(&mut self, event: Event) -> bool {
if let Some(any_mouse_event) = event.mouse_event() {
if let Some(MouseMoveEvent { position, .. }) = any_mouse_event.downcast_ref() {
@ -791,7 +796,7 @@ pub trait BorrowWindow: BorrowAppContext {
self.window_mut().element_id_stack.push(id);
let global_id = self.window_mut().element_id_stack.clone();
if let Some(any) = self
let result = if let Some(any) = self
.window_mut()
.element_states
.remove(&global_id)
@ -816,7 +821,11 @@ pub trait BorrowWindow: BorrowAppContext {
.element_states
.insert(global_id, Box::new(Some(state)));
result
}
};
self.window_mut().element_id_stack.pop();
result
}
fn content_mask(&self) -> ContentMask<Pixels> {