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));