mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use visible bounds to determine hit bounds for cursor/mouse regions

Browse source
This commit is contained in:
Antonio Scandurra 2022-06-08 10:17:22 +02:00
parent 5c84f4b92c
commit a26af194e7
4 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/gpui/src/elements/container.rs
View file

@ -212,11 +212,13 @@ impl Element for Container {
});
}
if let Some(style) = self.style.cursor {
cx.scene.push_cursor_region(CursorRegion {
bounds: quad_bounds,
style,
});
if let Some(hit_bounds) = quad_bounds.intersection(visible_bounds) {
if let Some(style) = self.style.cursor {
cx.scene.push_cursor_region(CursorRegion {
bounds: hit_bounds,
style,
});
}
}
let child_origin =

4
crates/gpui/src/elements/event_handler.rs
View file

@ -78,13 +78,13 @@ impl Element for EventHandler {
if let Some(discriminant) = self.capture_all {
cx.scene.push_stacking_context(None);
cx.scene.push_cursor_region(CursorRegion {
bounds,
bounds: visible_bounds,
style: Default::default(),
});
cx.scene.push_mouse_region(MouseRegion {
view_id: cx.current_view_id(),
discriminant: Some(discriminant),
bounds,
bounds: visible_bounds,
hover: Some(Rc::new(|_, _, _| {})),
mouse_down: Some(Rc::new(|_, _| {})),
click: Some(Rc::new(|_, _, _| {})),

5
crates/gpui/src/elements/mouse_event_handler.rs
View file

@ -152,9 +152,10 @@ impl Element for MouseEventHandler {
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
let hit_bounds = self.hit_bounds(visible_bounds);
if let Some(style) = self.cursor_style {
cx.scene.push_cursor_region(CursorRegion {
bounds: self.hit_bounds(bounds),
bounds: hit_bounds,
style,
});
}
@ -162,7 +163,7 @@ impl Element for MouseEventHandler {
cx.scene.push_mouse_region(MouseRegion {
view_id: cx.current_view_id(),
discriminant: Some((self.tag, self.id)),
bounds: self.hit_bounds(bounds),
bounds: hit_bounds,
hover: self.hover.clone(),
click: self.click.clone(),
mouse_down: self.mouse_down.clone(),

8
crates/gpui/src/scene.rs
View file

@ -250,11 +250,15 @@ impl Scene {
}
pub fn push_cursor_region(&mut self, region: CursorRegion) {
self.active_layer().push_cursor_region(region);
if can_draw(region.bounds) {
self.active_layer().push_cursor_region(region);
}
}
pub fn push_mouse_region(&mut self, region: MouseRegion) {
self.active_layer().push_mouse_region(region);
if can_draw(region.bounds) {
self.active_layer().push_mouse_region(region);
}
}
pub fn push_image(&mut self, image: Image) {