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

Reuse input handler when reusing a view tree

Browse source
This commit is contained in:
Antonio Scandurra 2024-01-11 13:22:59 +01:00
parent d088ace404
commit 50ccdf5c16
4 changed files with 67 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/gpui/src/platform.rs
View file

@ -145,7 +145,7 @@ pub trait PlatformWindow {
fn modifiers(&self) -> Modifiers; fn modifiers(&self) -> Modifiers;
fn as_any_mut(&mut self) -> &mut dyn Any; fn as_any_mut(&mut self) -> &mut dyn Any;
fn set_input_handler(&mut self, input_handler: Box<dyn PlatformInputHandler>); fn set_input_handler(&mut self, input_handler: Box<dyn PlatformInputHandler>);
fn clear_input_handler(&mut self); fn take_input_handler(&mut self) -> Option<Box<dyn PlatformInputHandler>>;
fn prompt(&self, level: PromptLevel, msg: &str, answers: &[&str]) -> oneshot::Receiver<usize>; fn prompt(&self, level: PromptLevel, msg: &str, answers: &[&str]) -> oneshot::Receiver<usize>;
fn activate(&self); fn activate(&self);
fn set_title(&mut self, title: &str); fn set_title(&mut self, title: &str);

4
crates/gpui/src/platform/mac/window.rs
View file

@ -770,8 +770,8 @@ impl PlatformWindow for MacWindow {
self.0.as_ref().lock().input_handler = Some(input_handler); self.0.as_ref().lock().input_handler = Some(input_handler);
} }
fn clear_input_handler(&mut self) { fn take_input_handler(&mut self) -> Option<Box<dyn PlatformInputHandler>> {
self.0.as_ref().lock().input_handler = None; self.0.as_ref().lock().input_handler.take()
} }
fn prompt(&self, level: PromptLevel, msg: &str, answers: &[&str]) -> oneshot::Receiver<usize> { fn prompt(&self, level: PromptLevel, msg: &str, answers: &[&str]) -> oneshot::Receiver<usize> {

4
crates/gpui/src/platform/test/window.rs
View file

@ -167,8 +167,8 @@ impl PlatformWindow for TestWindow {
self.0.lock().input_handler = Some(input_handler); self.0.lock().input_handler = Some(input_handler);
} }
fn clear_input_handler(&mut self) { fn take_input_handler(&mut self) -> Option<Box<dyn PlatformInputHandler>> {
self.0.lock().input_handler = None; self.0.lock().input_handler.take()
} }
fn prompt( fn prompt(

86
crates/gpui/src/window.rs
View file

@ -296,6 +296,11 @@ pub(crate) struct ElementStateBox {
type_name: &'static str, type_name: &'static str,
} }
struct RequestedInputHandler {
view_id: EntityId,
handler: Option<Box<dyn PlatformInputHandler>>,
}
pub(crate) struct Frame { pub(crate) struct Frame {
focus: Option<FocusId>, focus: Option<FocusId>,
window_active: bool, window_active: bool,
@ -308,6 +313,7 @@ pub(crate) struct Frame {
pub(crate) next_stacking_order_id: u32, pub(crate) next_stacking_order_id: u32,
content_mask_stack: Vec<ContentMask<Pixels>>, content_mask_stack: Vec<ContentMask<Pixels>>,
element_offset_stack: Vec<Point<Pixels>>, element_offset_stack: Vec<Point<Pixels>>,
requested_input_handler: Option<RequestedInputHandler>,
pub(crate) view_stack: Vec<EntityId>, pub(crate) view_stack: Vec<EntityId>,
pub(crate) reused_views: FxHashSet<EntityId>, pub(crate) reused_views: FxHashSet<EntityId>,
} }
@ -323,9 +329,10 @@ impl Frame {
scene: Scene::default(), scene: Scene::default(),
z_index_stack: StackingOrder::default(), z_index_stack: StackingOrder::default(),
next_stacking_order_id: 0, next_stacking_order_id: 0,
depth_map: Default::default(), depth_map: Vec::new(),
content_mask_stack: Vec::new(), content_mask_stack: Vec::new(),
element_offset_stack: Vec::new(), element_offset_stack: Vec::new(),
requested_input_handler: None,
view_stack: Vec::new(), view_stack: Vec::new(),
reused_views: FxHashSet::default(), reused_views: FxHashSet::default(),
} }
@ -947,7 +954,7 @@ impl<'a> WindowContext<'a> {
&mut self, &mut self,
mut handler: impl FnMut(&Event, DispatchPhase, &mut WindowContext) + 'static, mut handler: impl FnMut(&Event, DispatchPhase, &mut WindowContext) + 'static,
) { ) {
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let order = self.window.next_frame.z_index_stack.clone(); let order = self.window.next_frame.z_index_stack.clone();
self.window self.window
.next_frame .next_frame
@ -1036,7 +1043,7 @@ impl<'a> WindowContext<'a> {
/// Called during painting to track which z-index is on top at each pixel position /// Called during painting to track which z-index is on top at each pixel position
pub fn add_opaque_layer(&mut self, bounds: Bounds<Pixels>) { pub fn add_opaque_layer(&mut self, bounds: Bounds<Pixels>) {
let stacking_order = self.window.next_frame.z_index_stack.clone(); let stacking_order = self.window.next_frame.z_index_stack.clone();
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
self.window self.window
.next_frame .next_frame
.depth_map .depth_map
@ -1093,7 +1100,7 @@ impl<'a> WindowContext<'a> {
) { ) {
let scale_factor = self.scale_factor(); let scale_factor = self.scale_factor();
let content_mask = self.content_mask(); let content_mask = self.content_mask();
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
for shadow in shadows { for shadow in shadows {
let mut shadow_bounds = bounds; let mut shadow_bounds = bounds;
@ -1121,7 +1128,7 @@ impl<'a> WindowContext<'a> {
pub fn paint_quad(&mut self, quad: PaintQuad) { pub fn paint_quad(&mut self, quad: PaintQuad) {
let scale_factor = self.scale_factor(); let scale_factor = self.scale_factor();
let content_mask = self.content_mask(); let content_mask = self.content_mask();
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
window.next_frame.scene.insert( window.next_frame.scene.insert(
@ -1144,7 +1151,7 @@ impl<'a> WindowContext<'a> {
pub fn paint_path(&mut self, mut path: Path<Pixels>, color: impl Into<Hsla>) { pub fn paint_path(&mut self, mut path: Path<Pixels>, color: impl Into<Hsla>) {
let scale_factor = self.scale_factor(); let scale_factor = self.scale_factor();
let content_mask = self.content_mask(); let content_mask = self.content_mask();
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
path.content_mask = content_mask; path.content_mask = content_mask;
path.color = color.into(); path.color = color.into();
@ -1174,7 +1181,7 @@ impl<'a> WindowContext<'a> {
size: size(width, height), size: size(width, height),
}; };
let content_mask = self.content_mask(); let content_mask = self.content_mask();
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
window.next_frame.scene.insert( window.next_frame.scene.insert(
@ -1231,7 +1238,7 @@ impl<'a> WindowContext<'a> {
size: tile.bounds.size.map(Into::into), size: tile.bounds.size.map(Into::into),
}; };
let content_mask = self.content_mask().scale(scale_factor); let content_mask = self.content_mask().scale(scale_factor);
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
window.next_frame.scene.insert( window.next_frame.scene.insert(
&window.next_frame.z_index_stack, &window.next_frame.z_index_stack,
@ -1284,7 +1291,7 @@ impl<'a> WindowContext<'a> {
size: tile.bounds.size.map(Into::into), size: tile.bounds.size.map(Into::into),
}; };
let content_mask = self.content_mask().scale(scale_factor); let content_mask = self.content_mask().scale(scale_factor);
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
window.next_frame.scene.insert( window.next_frame.scene.insert(
@ -1329,7 +1336,7 @@ impl<'a> WindowContext<'a> {
Ok((params.size, Cow::Owned(bytes))) Ok((params.size, Cow::Owned(bytes)))
})?; })?;
let content_mask = self.content_mask().scale(scale_factor); let content_mask = self.content_mask().scale(scale_factor);
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
window.next_frame.scene.insert( window.next_frame.scene.insert(
@ -1368,7 +1375,7 @@ impl<'a> WindowContext<'a> {
})?; })?;
let content_mask = self.content_mask().scale(scale_factor); let content_mask = self.content_mask().scale(scale_factor);
let corner_radii = corner_radii.scale(scale_factor); let corner_radii = corner_radii.scale(scale_factor);
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
window.next_frame.scene.insert( window.next_frame.scene.insert(
@ -1392,7 +1399,7 @@ impl<'a> WindowContext<'a> {
let scale_factor = self.scale_factor(); let scale_factor = self.scale_factor();
let bounds = bounds.scale(scale_factor); let bounds = bounds.scale(scale_factor);
let content_mask = self.content_mask().scale(scale_factor); let content_mask = self.content_mask().scale(scale_factor);
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut *self.window; let window = &mut *self.window;
window.next_frame.scene.insert( window.next_frame.scene.insert(
&window.next_frame.z_index_stack, &window.next_frame.z_index_stack,
@ -1408,14 +1415,27 @@ impl<'a> WindowContext<'a> {
} }
pub(crate) fn reuse_view(&mut self) { pub(crate) fn reuse_view(&mut self) {
let view_id = self.parent_view_id().unwrap(); let view_id = self.parent_view_id();
let window = &mut self.window; let grafted_view_ids = self
let grafted_view_ids = window .window
.next_frame .next_frame
.dispatch_tree .dispatch_tree
.graft(view_id, &mut window.rendered_frame.dispatch_tree); .graft(view_id, &mut self.window.rendered_frame.dispatch_tree);
for view_id in grafted_view_ids { for view_id in grafted_view_ids {
assert!(window.next_frame.reused_views.insert(view_id)); assert!(self.window.next_frame.reused_views.insert(view_id));
// Reuse the previous input handler if it was associated with one of
// the views grafted from the tree in the previous frame.
if self
.window
.rendered_frame
.requested_input_handler
.as_ref()
.map_or(false, |requested| requested.view_id == view_id)
{
self.window.next_frame.requested_input_handler =
self.window.rendered_frame.requested_input_handler.take();
}
} }
} }
@ -1430,7 +1450,11 @@ impl<'a> WindowContext<'a> {
} }
self.text_system().start_frame(); self.text_system().start_frame();
self.window.platform_window.clear_input_handler(); if let Some(requested_handler) = self.window.rendered_frame.requested_input_handler.as_mut()
{
requested_handler.handler = self.window.platform_window.take_input_handler();
}
self.window.layout_engine.as_mut().unwrap().clear(); self.window.layout_engine.as_mut().unwrap().clear();
self.window.next_frame.clear(); self.window.next_frame.clear();
let root_view = self.window.root_view.take().unwrap(); let root_view = self.window.root_view.take().unwrap();
@ -1486,6 +1510,13 @@ impl<'a> WindowContext<'a> {
.reuse_views(&mut self.window.rendered_frame); .reuse_views(&mut self.window.rendered_frame);
self.window.next_frame.scene.finish(); self.window.next_frame.scene.finish();
// Register requested input handler with the platform window.
if let Some(requested_input) = self.window.next_frame.requested_input_handler.as_mut() {
if let Some(handler) = requested_input.handler.take() {
self.window.platform_window.set_input_handler(handler);
}
}
let previous_focus_path = self.window.rendered_frame.focus_path(); let previous_focus_path = self.window.rendered_frame.focus_path();
let previous_window_active = self.window.rendered_frame.window_active; let previous_window_active = self.window.rendered_frame.window_active;
mem::swap(&mut self.window.rendered_frame, &mut self.window.next_frame); mem::swap(&mut self.window.rendered_frame, &mut self.window.next_frame);
@ -2054,7 +2085,7 @@ impl<'a> WindowContext<'a> {
result result
} else { } else {
let (result, state) = f(None, cx); let (result, state) = f(None, cx);
let parent_view_id = cx.parent_view_id().unwrap(); let parent_view_id = cx.parent_view_id();
cx.window_mut() cx.window_mut()
.next_frame .next_frame
.element_states .element_states
@ -2072,8 +2103,13 @@ impl<'a> WindowContext<'a> {
}) })
} }
fn parent_view_id(&self) -> Option<EntityId> { fn parent_view_id(&self) -> EntityId {
self.window.next_frame.view_stack.last().copied() *self
.window
.next_frame
.view_stack
.last()
.expect("a view should always be on the stack while drawing")
} }
/// Set an input handler, such as [`ElementInputHandler`][element_input_handler], which interfaces with the /// Set an input handler, such as [`ElementInputHandler`][element_input_handler], which interfaces with the
@ -2087,9 +2123,11 @@ impl<'a> WindowContext<'a> {
input_handler: impl PlatformInputHandler, input_handler: impl PlatformInputHandler,
) { ) {
if focus_handle.is_focused(self) { if focus_handle.is_focused(self) {
self.window let view_id = self.parent_view_id();
.platform_window self.window.next_frame.requested_input_handler = Some(RequestedInputHandler {
.set_input_handler(Box::new(input_handler)); view_id,
handler: Some(Box::new(input_handler)),
})
} }
} }