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

Fix bounds calculations

Browse source
This commit is contained in:
Nathan Sobo 2023-09-08 06:45:23 -06:00
parent 7738867639
commit 713d72942d
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/gpui2/src/elements/div.rs
View file

@ -118,7 +118,6 @@ impl<V: 'static> Div<V> {
}) })
} }
let bounds = layout.bounds;
let pressed = Cell::new(hovered && cx.is_mouse_down(MouseButton::Left)); let pressed = Cell::new(hovered && cx.is_mouse_down(MouseButton::Left));
cx.on_event(layout.order, move |_, event: &MouseButtonEvent, _| { cx.on_event(layout.order, move |_, event: &MouseButtonEvent, _| {
if bounds.contains_point(event.position) { if bounds.contains_point(event.position) {

5
crates/gpui2/src/elements/hoverable.rs
View file

@ -63,15 +63,14 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
) where ) where
Self: Sized, Self: Sized,
{ {
self.hovered let bounds = layout.bounds + parent_origin;
.set(layout.bounds.contains_point(cx.mouse_position())); self.hovered.set(bounds.contains_point(cx.mouse_position()));
let slot = self.cascade_slot; let slot = self.cascade_slot;
let style = self.hovered.get().then_some(self.hovered_style.clone()); let style = self.hovered.get().then_some(self.hovered_style.clone());
self.style_cascade().set(slot, style); self.style_cascade().set(slot, style);
let hovered = self.hovered.clone(); let hovered = self.hovered.clone();
let bounds = layout.bounds;
cx.on_event(layout.order, move |_view, _: &MouseMovedEvent, cx| { cx.on_event(layout.order, move |_view, _: &MouseMovedEvent, cx| {
cx.bubble_event(); cx.bubble_event();
if bounds.contains_point(cx.mouse_position()) != hovered.get() { if bounds.contains_point(cx.mouse_position()) != hovered.get() {

2
crates/gpui2/src/elements/pressable.rs
View file

@ -68,7 +68,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
self.style_cascade().set(slot, style); self.style_cascade().set(slot, style);
let pressed = self.pressed.clone(); let pressed = self.pressed.clone();
let bounds = layout.bounds; let bounds = layout.bounds + parent_origin;
cx.on_event(layout.order, move |_view, event: &MouseButtonEvent, cx| { cx.on_event(layout.order, move |_view, event: &MouseButtonEvent, cx| {
if event.is_down { if event.is_down {
if bounds.contains_point(event.position) { if bounds.contains_point(event.position) {