Update to ui-events and ui-events-winit 0.2.0.

xorgy · xorgy · commit e758663fee54 · 2025-08-28T22:04:56.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -55,8 +55,8 @@ parley = { git = "https://github.com/linebender/parley", rev = "587b7634ae8601c1
 peniko = "0.4.0"
 winit = "0.30.10"
 tracing = { version = "0.1.41", default-features = false }
-ui-events = "0.1.0"
-ui-events-winit = "0.1.0"
+ui-events = { git = "https://github.com/endoli/ui-events", rev = "6382e63" }
+ui-events-winit = { git = "https://github.com/endoli/ui-events", rev = "6382e63" }
 smallvec = "1.15.0"
 hashbrown = "0.15.3"
 dpi = "0.1.2"
diff --git a/masonry/src/doc/color_rectangle.rs b/masonry/src/doc/color_rectangle.rs
@@ -85,10 +85,7 @@ impl Widget for ColorRectangle {
         event: &PointerEvent,
     ) {
         match event {
-            PointerEvent::Down {
-                button: Some(PointerButton::Primary),
-                ..
-            } => {
+            PointerEvent::Down(b) if b.button == Some(PointerButton::Primary) => {
                 ctx.submit_action::<Self::Action>(ColorRectanglePress);
             }
             _ => {}
diff --git a/masonry/src/widgets/button.rs b/masonry/src/widgets/button.rs
@@ -112,15 +112,15 @@ impl Widget for Button {
         event: &PointerEvent,
     ) {
         match event {
-            PointerEvent::Down { .. } => {
+            PointerEvent::Down(..) => {
                 ctx.capture_pointer();
                 // Changes in pointer capture impact appearance, but not accessibility node
                 ctx.request_paint_only();
                 trace!("Button {:?} pressed", ctx.widget_id());
             }
-            PointerEvent::Up { button, .. } => {
+            PointerEvent::Up(b) => {
                 if ctx.is_active() && ctx.is_hovered() {
-                    ctx.submit_action::<Self::Action>(ButtonPress { button: *button });
+                    ctx.submit_action::<Self::Action>(ButtonPress { button: b.button });
                     trace!("Button {:?} released", ctx.widget_id());
                 }
                 // Changes in pointer capture impact appearance, but not accessibility node
diff --git a/masonry/src/widgets/portal.rs b/masonry/src/widgets/portal.rs
@@ -270,10 +270,10 @@ impl<W: Widget + FromDynWidget + ?Sized> Widget for Portal<W> {
         let content_size = self.content_size;
 
         match *event {
-            PointerEvent::Scroll { delta, .. } => {
+            PointerEvent::Scroll(ref s) => {
                 // TODO - Remove reference to scale factor.
                 // See https://github.com/linebender/xilem/issues/1264
-                let delta = match delta {
+                let delta = match s.delta {
                     ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x, y }) => -Vec2 { x, y },
                     ScrollDelta::LineDelta(x, y) => {
                         -Vec2 {
diff --git a/masonry/src/widgets/scroll_bar.rs b/masonry/src/widgets/scroll_bar.rs
@@ -129,12 +129,12 @@ impl Widget for ScrollBar {
         event: &PointerEvent,
     ) {
         match event {
-            PointerEvent::Down { state, .. } => {
+            PointerEvent::Down(b) => {
                 ctx.capture_pointer();
 
                 let cursor_min_length = theme::SCROLLBAR_MIN_SIZE;
                 let cursor_rect = self.get_cursor_rect(ctx.size(), cursor_min_length);
-                let mouse_pos = ctx.local_position(state.position);
+                let mouse_pos = ctx.local_position(b.state.position);
                 if cursor_rect.contains(mouse_pos) {
                     let (z0, z1) = self.axis.major_span(cursor_rect);
                     let mouse_major = self.axis.major_pos(mouse_pos);
@@ -160,7 +160,7 @@ impl Widget for ScrollBar {
                 }
                 ctx.request_render();
             }
-            PointerEvent::Up { .. } | PointerEvent::Cancel(..) => {
+            PointerEvent::Up(..) | PointerEvent::Cancel(..) => {
                 self.grab_anchor = None;
                 ctx.request_render();
             }
diff --git a/masonry/src/widgets/split.rs b/masonry/src/widgets/split.rs
@@ -395,8 +395,8 @@ where
     ) {
         if self.draggable {
             match event {
-                PointerEvent::Down { state, .. } => {
-                    let pos = ctx.local_position(state.position);
+                PointerEvent::Down(b) => {
+                    let pos = ctx.local_position(b.state.position);
                     if self.bar_hit_test(ctx.size(), pos) {
                         ctx.set_handled();
                         ctx.capture_pointer();
diff --git a/masonry/src/widgets/text_area.rs b/masonry/src/widgets/text_area.rs
@@ -429,12 +429,12 @@ impl<const EDITABLE: bool> Widget for TextArea<EDITABLE> {
         }
 
         match event {
-            PointerEvent::Down { button, state, .. } => {
-                if matches!(button, None | Some(PointerButton::Primary)) {
-                    let cursor_pos = ctx.local_position(state.position);
+            PointerEvent::Down(b) => {
+                if matches!(b.button, None | Some(PointerButton::Primary)) {
+                    let cursor_pos = ctx.local_position(b.state.position);
                     let (fctx, lctx) = ctx.text_contexts();
                     let mut drv = self.editor.driver(fctx, lctx);
-                    match state.count {
+                    match b.state.count {
                         2 => drv.select_word_at_point(cursor_pos.x as f32, cursor_pos.y as f32),
                         3 => drv.select_line_at_point(cursor_pos.x as f32, cursor_pos.y as f32),
                         _ => drv.move_to_point(cursor_pos.x as f32, cursor_pos.y as f32),
diff --git a/masonry/src/widgets/virtual_scroll.rs b/masonry/src/widgets/virtual_scroll.rs
@@ -524,10 +524,10 @@ impl Widget for VirtualScroll {
         event: &PointerEvent,
     ) {
         match event {
-            PointerEvent::Scroll { delta, .. } => {
+            PointerEvent::Scroll(s) => {
                 // TODO - Remove reference to scale factor.
                 // See https://github.com/linebender/xilem/issues/1264
-                let delta = match delta {
+                let delta = match s.delta {
                     ScrollDelta::PixelDelta(p) => -p.to_logical::<f64>(ctx.get_scale_factor()).y,
                     ScrollDelta::LineDelta(_, y) => -y as f64 * ctx.get_scale_factor() * 120.,
                     _ => 0.0,
@@ -1030,15 +1030,13 @@ fn opt_iter_difference(
 mod tests {
     use std::collections::HashSet;
 
-    use dpi::PhysicalPosition;
+    use kurbo::{Size, Vec2};
     use parley::StyleProperty;
-    use vello::kurbo::Size;
 
-    use crate::core::{
-        NewWidget, PointerEvent, PointerState, ScrollDelta, Widget, WidgetId, WidgetMut,
-    };
-    use crate::testing::{PRIMARY_MOUSE, TestHarness, assert_render_snapshot};
+    use crate::core::{NewWidget, Widget, WidgetId, WidgetMut};
+    use crate::testing::{TestHarness, assert_render_snapshot};
     use crate::theme::default_property_set;
+    use crate::vello::kurbo;
     use crate::widgets::{Label, VirtualScroll, VirtualScrollAction};
 
     use super::opt_iter_difference;
@@ -1114,11 +1112,7 @@ mod tests {
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         assert_render_snapshot!(harness, "virtual_scroll_moved");
         harness.mouse_move_to(virtual_scroll_id);
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: 25. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: 25. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         assert_render_snapshot!(harness, "virtual_scroll_scrolled");
     }
@@ -1159,11 +1153,7 @@ mod tests {
         });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         harness.mouse_move_to(virtual_scroll_id);
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: 200. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: 200. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
     }
 
@@ -1203,11 +1193,7 @@ mod tests {
         });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         harness.mouse_move_to(virtual_scroll_id);
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: 200. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: 200. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
     }
 
@@ -1247,11 +1233,7 @@ mod tests {
         });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         harness.mouse_move_to(virtual_scroll_id);
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: 200. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: 200. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
     }
 
@@ -1306,22 +1288,14 @@ mod tests {
             original_range = widget.active_range.clone();
         }
         harness.mouse_move_to(virtual_scroll_id);
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: -50. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: -50. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         {
             let widget = harness.root_widget();
             assert_ne!(widget.anchor_index, MIN);
             assert_ne!(widget.active_range, original_range);
         }
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: 60. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: 60. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         {
             let widget = harness.root_widget();
@@ -1383,22 +1357,14 @@ mod tests {
             assert_render_snapshot!(harness, "virtual_scroll_limited_up_bottom");
         }
         harness.mouse_move_to(virtual_scroll_id);
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: 5. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: 5. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         {
             let widget = harness.root_widget();
             assert_ne!(widget.anchor_index, MAX);
             assert_ne!(widget.active_range, original_range);
         }
-        harness.process_pointer_event(PointerEvent::Scroll {
-            pointer: PRIMARY_MOUSE,
-            delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> { x: 0., y: -6. }),
-            state: PointerState::default(),
-        });
+        harness.mouse_wheel(Vec2 { x: 0., y: -6. });
         drive_to_fixpoint(&mut harness, virtual_scroll_id, driver);
         {
             let widget = harness.root_widget();
diff --git a/masonry_core/src/core/mod.rs b/masonry_core/src/core/mod.rs
@@ -42,7 +42,8 @@ pub use widget_tag::WidgetTag;
 
 pub use ui_events::keyboard::{KeyboardEvent, Modifiers};
 pub use ui_events::pointer::{
-    PointerButton, PointerEvent, PointerId, PointerInfo, PointerState, PointerType, PointerUpdate,
+    PointerButton, PointerButtonEvent, PointerEvent, PointerId, PointerInfo, PointerScrollEvent,
+    PointerState, PointerType, PointerUpdate,
 };
 pub use ui_events::{ScrollDelta, keyboard, pointer};
 
diff --git a/masonry_core/src/passes/event.rs b/masonry_core/src/passes/event.rs
@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use tracing::{debug, info_span, trace};
-use ui_events::pointer::PointerType;
 
 use crate::app::{RenderRoot, RenderRootSignal};
 use crate::core::keyboard::{Key, KeyState, NamedKey};
 use crate::core::{
-    AccessEvent, EventCtx, Handled, Ime, PointerEvent, PointerInfo, PointerUpdate, PropertiesMut,
-    TextEvent, Widget, WidgetId,
+    AccessEvent, EventCtx, Handled, Ime, PointerButtonEvent, PointerEvent, PointerInfo,
+    PointerScrollEvent, PointerType, PointerUpdate, PropertiesMut, TextEvent, Widget, WidgetId,
 };
 use crate::debug_panic;
 use crate::dpi::{LogicalPosition, PhysicalPosition};
@@ -47,23 +46,23 @@ fn is_very_frequent(e: &PointerEvent) -> bool {
 /// Short name for a [`PointerEvent`].
 fn pointer_event_short_name(e: &PointerEvent) -> &'static str {
     match e {
-        PointerEvent::Down { .. } => "Down",
-        PointerEvent::Up { .. } => "Up",
+        PointerEvent::Down(..) => "Down",
+        PointerEvent::Up(..) => "Up",
         PointerEvent::Move(..) => "Move",
         PointerEvent::Enter(..) => "Enter",
         PointerEvent::Leave(..) => "Leave",
         PointerEvent::Cancel(..) => "Cancel",
-        PointerEvent::Scroll { .. } => "Scroll",
+        PointerEvent::Scroll(..) => "Scroll",
     }
 }
 
 /// A position if the event has one.
 fn try_event_position(event: &PointerEvent) -> Option<PhysicalPosition<f64>> {
     match event {
-        PointerEvent::Down { state, .. }
-        | PointerEvent::Up { state, .. }
+        PointerEvent::Down(PointerButtonEvent { state, .. })
+        | PointerEvent::Up(PointerButtonEvent { state, .. })
         | PointerEvent::Move(PointerUpdate { current: state, .. })
-        | PointerEvent::Scroll { state, .. } => Some(state.position),
+        | PointerEvent::Scroll(PointerScrollEvent { state, .. }) => Some(state.position),
         _ => None,
     }
 }
diff --git a/masonry_testing/src/harness.rs b/masonry_testing/src/harness.rs
@@ -23,9 +23,9 @@ use masonry_core::app::{
 };
 use masonry_core::core::{
     CursorIcon, DefaultProperties, ErasedAction, FromDynWidget, Handled, Ime, KeyboardEvent,
-    Modifiers, NewWidget, PointerButton, PointerEvent, PointerId, PointerInfo, PointerState,
-    PointerType, PointerUpdate, ScrollDelta, TextEvent, Widget, WidgetId, WidgetMut, WidgetRef,
-    WidgetTag, WindowEvent,
+    Modifiers, NewWidget, PointerButton, PointerButtonEvent, PointerEvent, PointerId, PointerInfo,
+    PointerScrollEvent, PointerState, PointerType, PointerUpdate, ScrollDelta, TextEvent, Widget,
+    WidgetId, WidgetMut, WidgetRef, WidgetTag, WindowEvent,
 };
 use masonry_core::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
 use masonry_core::kurbo::{Point, Size, Vec2};
@@ -596,30 +596,30 @@ impl<W: Widget> TestHarness<W> {
     /// Send a [`Down`](PointerEvent::Down) event to the window.
     pub fn mouse_button_press(&mut self, button: PointerButton) {
         self.mouse_state.buttons.insert(button);
-        self.process_pointer_event(PointerEvent::Down {
+        self.process_pointer_event(PointerEvent::Down(PointerButtonEvent {
             pointer: PRIMARY_MOUSE,
             button: button.into(),
             state: self.mouse_state.clone(),
-        });
+        }));
     }
 
     /// Send an [`Up`](PointerEvent::Up) event to the window.
     pub fn mouse_button_release(&mut self, button: PointerButton) {
         self.mouse_state.buttons.remove(button);
-        self.process_pointer_event(PointerEvent::Up {
+        self.process_pointer_event(PointerEvent::Up(PointerButtonEvent {
             pointer: PRIMARY_MOUSE,
             button: button.into(),
             state: self.mouse_state.clone(),
-        });
+        }));
     }
 
     /// Send a [`Scroll`](PointerEvent::Scroll) event to the window.
     pub fn mouse_wheel(&mut self, Vec2 { x, y }: Vec2) {
-        self.process_pointer_event(PointerEvent::Scroll {
+        self.process_pointer_event(PointerEvent::Scroll(PointerScrollEvent {
             pointer: PRIMARY_MOUSE,
             delta: ScrollDelta::PixelDelta(PhysicalPosition { x, y }),
             state: self.mouse_state.clone(),
-        });
+        }));
     }
 
     /// Send events that lead to a given widget being clicked.
