Update ui-events to 0.2.0.

Author: xorgy

Cargo.lock

@@ -18,7 +18,7 @@ ndk = "0.9.0"
 num_enum = "0.7.3"
 send_wrapper = "0.6.0"
 smallvec = "1.15.0"
-ui-events = "0.1.0"
+ui-events = { version = "0.2.0", default-features = false }
 
 [profile.dev]
 panic = "abort"

Cargo.toml

@@ -17,7 +17,7 @@ log = "0.4.26"
 parley = { version = "0.6.0", features = ["accesskit"] }
 peniko = { version = "0.5.0", default-features = false }
 pollster = "0.4.0"
-ui-events = "0.1.0"
+ui-events = { version = "0.2.0", default-features = false }
 vello = "0.6.0"
 
 # Send tracing events to Android GPU inspector, for profiling

demo/Cargo.toml

@@ -372,7 +372,7 @@ impl ViewPeer for DemoViewPeer {
             return false;
         };
 
-        if matches!(ev, PointerEvent::Up { .. }) {
+        if matches!(ev, PointerEvent::Up(..)) {
             ctx.push_static_deferred_callback(show_soft_input);
         }
 
@@ -438,9 +438,16 @@ impl ViewPeer for DemoViewPeer {
         width: jint,
         height: jint,
     ) {
-        self.tap_counter = TapCounter::new(ctx.view.view_configuration(&mut ctx.env));
+        let android_ctx = ctx.view.context(&mut ctx.env);
+        let scale_factor = {
+            let res = android_ctx.resources(&mut ctx.env);
+            let metrics = res.display_metrics(&mut ctx.env);
+            metrics.density(&mut ctx.env) as f64
+        };
+        self.tap_counter = TapCounter::new(ctx.view.view_configuration(&mut ctx.env), scale_factor);
         let editor = self.editor.editor_mut();
-        editor.set_scale(1.0);
+        #[allow(clippy::cast_possible_truncation, reason = "Unavoidable")]
+        editor.set_scale(scale_factor as f32);
         editor.set_width(Some(width as f32 - 2_f32 * text::INSET));
         self.last_drawn_generation = Default::default();
         let focused = ctx.view.is_focused(&mut ctx.env);

demo/src/lib.rs

@@ -12,7 +12,7 @@ use parley::{
 use std::time::{Duration, Instant};
 use ui_events::{
     keyboard::{Code, Key, KeyState, KeyboardEvent, NamedKey},
-    pointer::{PointerButton, PointerEvent, PointerState, PointerUpdate},
+    pointer::{PointerButton, PointerButtonEvent, PointerEvent, PointerState, PointerUpdate},
 };
 use vello::{
     Scene,
@@ -310,7 +310,7 @@ impl Editor {
     pub fn handle_pointer_event(&mut self, ev: PointerEvent) -> bool {
         let mut drv = self.editor.driver(&mut self.font_cx, &mut self.layout_cx);
         match ev {
-            PointerEvent::Down {
+            PointerEvent::Down(PointerButtonEvent {
                 button: None | Some(PointerButton::Primary),
                 state:
                     PointerState {
@@ -320,7 +320,7 @@ impl Editor {
                         ..
                     },
                 ..
-            } => match count {
+            }) => match count {
                 2 => drv.select_word_at_point(position.x as f32 - INSET, position.y as f32 - INSET),
                 3 => drv.select_line_at_point(position.x as f32 - INSET, position.y as f32 - INSET),
                 1 if modifiers.shift() => drv.extend_selection_to_point(

demo/src/text.rs

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 android-view = { path = ".." }
-masonry = { git = "https://github.com/linebender/xilem", rev = "2750659" }
+masonry = { git = "https://github.com/linebender/xilem", rev = "de88321" }
 masonry_android = { path = "../masonry" }
 
 # Send tracing events to Android GPU inspector, for profiling

masonry-demo/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2024"
 [dependencies]
 accesskit_android = "0.4.0"
 android-view = { path = ".." }
-masonry_core = { git = "https://github.com/linebender/xilem", rev = "2750659" }
+masonry_core = { git = "https://github.com/linebender/xilem", rev = "de88321" }
 pollster = "0.4.0"
 tracing = "0.1.40"

masonry/Cargo.toml

@@ -453,7 +453,8 @@ impl<Driver: AppDriver> ViewPeer for MasonryViewPeer<Driver> {
     ) {
         let android_ctx = ctx.view.context(&mut ctx.env);
         let scale_factor = scale_factor(&mut ctx.env, &android_ctx);
-        self.state.tap_counter = TapCounter::new(ctx.view.view_configuration(&mut ctx.env));
+        self.state.tap_counter =
+            TapCounter::new(ctx.view.view_configuration(&mut ctx.env), scale_factor);
         self.state
             .render_root
             .handle_window_event(WindowEvent::Rescale(scale_factor));

masonry/src/lib.rs

@@ -12,7 +12,10 @@ use num_enum::FromPrimitive;
 use ui_events::{
     ScrollDelta,
     keyboard::{KeyboardEvent, Modifiers},
-    pointer::{ContactGeometry, PointerEvent, PointerId, PointerState, PointerUpdate},
+    pointer::{
+        ContactGeometry, PointerButtonEvent, PointerEvent, PointerId, PointerScrollEvent,
+        PointerState, PointerUpdate,
+    },
 };
 
 use crate::ViewConfiguration;
@@ -439,6 +442,8 @@ impl<'local> MotionEvent<'local> {
                 x: self.axis(env, Axis::X, action_index) as f64,
                 y: self.axis(env, Axis::Y, action_index) as f64,
             },
+            // `TapCounter` will attach the scale.
+            scale_factor: 1.0,
             buttons,
             // `TapCounter` will attach an appropriate count.
             count: 0,
@@ -469,16 +474,18 @@ impl<'local> MotionEvent<'local> {
         };
 
         Some(match action {
-            MotionAction::Down | MotionAction::PointerDown => PointerEvent::Down {
-                pointer,
-                state,
-                button,
-            },
-            MotionAction::Up | MotionAction::PointerUp => PointerEvent::Up {
+            MotionAction::Down | MotionAction::PointerDown => {
+                PointerEvent::Down(PointerButtonEvent {
+                    pointer,
+                    state,
+                    button,
+                })
+            }
+            MotionAction::Up | MotionAction::PointerUp => PointerEvent::Up(PointerButtonEvent {
                 pointer,
                 state,
                 button,
-            },
+            }),
             MotionAction::Move | MotionAction::HoverMove => {
                 let hsz = self.history_size(env);
                 let mut coalesced: Vec<PointerState> = vec![state.clone(); hsz as usize];
@@ -531,7 +538,7 @@ impl<'local> MotionEvent<'local> {
             MotionAction::Cancel => PointerEvent::Cancel(pointer),
             MotionAction::HoverEnter => PointerEvent::Enter(pointer),
             MotionAction::HoverExit => PointerEvent::Leave(pointer),
-            MotionAction::Scroll => PointerEvent::Scroll {
+            MotionAction::Scroll => PointerEvent::Scroll(PointerScrollEvent {
                 pointer,
                 delta: ScrollDelta::PixelDelta(PhysicalPosition::<f64> {
                     x: (self.axis(env, Axis::Hscroll, action_index)
@@ -540,7 +547,7 @@ impl<'local> MotionEvent<'local> {
                         * vc.scaled_vertical_scroll_factor) as f64,
                 }),
                 state,
-            },
+            }),
             _ => {
                 // Other current `MotionAction` values relate to gamepad/joystick buttons;
                 // ui-events doesn't currently have types for these, so consider them unhandled.
@@ -610,25 +617,31 @@ struct TapState {
 pub struct TapCounter {
     /// The `ViewConfiguration` which configures tap counting.
     pub vc: ViewConfiguration,
+    /// The scale factor.
+    pub scale_factor: f64,
     /// Recent taps which can be used for tap counting.
     taps: Vec<TapState>,
 }
 
 impl TapCounter {
     /// Make a new `TapCounter` with `ViewConfiguration` from your view.
-    pub fn new(vc: ViewConfiguration) -> Self {
-        Self { vc, taps: vec![] }
+    pub fn new(vc: ViewConfiguration, scale_factor: f64) -> Self {
+        Self {
+            vc,
+            scale_factor,
+            taps: vec![],
+        }
     }
 
     /// Enhance a `PointerEvent` with `count`.
     ///
     pub fn attach_count(&mut self, e: PointerEvent) -> PointerEvent {
         match e {
-            PointerEvent::Down {
+            PointerEvent::Down(PointerButtonEvent {
                 button,
                 pointer,
                 state,
-            } => {
+            }) => {
                 let e = if let Some(i) =
                     self.taps.iter().position(|TapState { x, y, up_time, .. }| {
                         let dx = (x - state.position.x).abs();
@@ -645,11 +658,15 @@ impl TapCounter {
                     self.taps[i].x = state.position.x;
                     self.taps[i].y = state.position.y;
 
-                    PointerEvent::Down {
+                    PointerEvent::Down(PointerButtonEvent {
                         button,
                         pointer,
-                        state: PointerState { count, ..state },
-                    }
+                        state: PointerState {
+                            count,
+                            scale_factor: self.scale_factor,
+                            ..state
+                        },
+                    })
                 } else {
                     let s = TapState {
                         pointer_id: pointer.pointer_id,
@@ -660,34 +677,39 @@ impl TapCounter {
                         y: state.position.y,
                     };
                     self.taps.push(s);
-                    PointerEvent::Down {
+                    PointerEvent::Down(PointerButtonEvent {
                         button,
                         pointer,
-                        state: PointerState { count: 1, ..state },
-                    }
+                        state: PointerState {
+                            count: 1,
+                            scale_factor: self.scale_factor,
+                            ..state
+                        },
+                    })
                 };
                 self.clear_expired(state.time);
                 e
             }
-            PointerEvent::Up {
+            PointerEvent::Up(PointerButtonEvent {
                 button,
                 pointer,
                 ref state,
-            } => {
+            }) => {
                 if let Some(i) = self
                     .taps
                     .iter()
                     .position(|TapState { pointer_id, .. }| *pointer_id == pointer.pointer_id)
                 {
                     self.taps[i].up_time = state.time;
-                    PointerEvent::Up {
+                    PointerEvent::Up(PointerButtonEvent {
                         button,
                         pointer,
                         state: PointerState {
                             count: self.taps[i].count,
+                            scale_factor: self.scale_factor,
                             ..state.clone()
                         },
-                    }
+                    })
                 } else {
                     e.clone()
                 }
@@ -717,17 +739,26 @@ impl TapCounter {
                         pointer,
                         current: PointerState {
                             count,
+                            scale_factor: self.scale_factor,
                             ..current.clone()
                         },
                         coalesced: coalesced
                             .iter()
                             .cloned()
-                            .map(|u| PointerState { count, ..u })
+                            .map(|u| PointerState {
+                                count,
+                                scale_factor: self.scale_factor,
+                                ..u
+                            })
                             .collect(),
                         predicted: predicted
                             .iter()
                             .cloned()
-                            .map(|u| PointerState { count, ..u })
+                            .map(|u| PointerState {
+                                count,
+                                scale_factor: self.scale_factor,
+                                ..u
+                            })
                             .collect(),
                     })
                 } else {
@@ -739,7 +770,9 @@ impl TapCounter {
                     .retain(|TapState { pointer_id, .. }| *pointer_id != p.pointer_id);
                 e.clone()
             }
-            PointerEvent::Enter(..) | PointerEvent::Scroll { .. } => e.clone(),
+            PointerEvent::Enter(..) | PointerEvent::Scroll(..) | PointerEvent::Gesture(..) => {
+                e.clone()
+            }
         }
     }