snowcap: Update cursor position on touch event

Iced widgets ignores the touch position when updating widget, leading to
some confusing behavior.

This is just a workaround that update the surface "cursor position"
since it's used by mouse_area and buttons.

Author: Ph4ntomas

snowcap/src/handlers/pointer.rs

@@ -23,17 +23,17 @@ impl PointerHandler for State {
                 return;
             };
 
+            surface.pointer_location = Some(event.position);
+
             let iced_event = match event.kind {
                 PointerEventKind::Enter { serial: _ } => {
-                    surface.pointer_location = Some(event.position);
                     iced::Event::Mouse(iced::mouse::Event::CursorEntered)
                 }
                 PointerEventKind::Leave { serial: _ } => {
                     surface.pointer_location = None;
                     iced::Event::Mouse(iced::mouse::Event::CursorLeft)
                 }
                 PointerEventKind::Motion { time: _ } => {
-                    surface.pointer_location = Some(event.position);
                     iced::Event::Mouse(iced::mouse::Event::CursorMoved {
                         position: iced::Point {
                             x: event.position.0 as f32,

snowcap/src/handlers/touch.rs

@@ -103,8 +103,11 @@ impl State {
             y: touch.last_pos.1 as f32,
         };
 
-        let event = iced::Event::Touch(iced::touch::Event::FingerPressed { id, position });
+        // HACK: Iced ignores the touch locations, so we're overriding the cursor position here.
+        // FIXME: Once iced gets correct touch handling, remove this.
+        surface.pointer_location = Some(touch.last_pos);
 
+        let event = iced::Event::Touch(iced::touch::Event::FingerPressed { id, position });
         surface.widgets.queue_event(event);
         self.active_touches.push(touch);
     }
@@ -127,14 +130,17 @@ impl State {
             return;
         };
 
+        // HACK: Iced ignores the touch locations, so we're overriding the cursor position here.
+        // FIXME: Once iced gets correct touch handling, remove this.
+        surface.pointer_location = Some(touch.last_pos);
+
         let id = iced::touch::Finger(touch.id as u64);
         let position = iced::Point {
             x: touch.last_pos.0 as f32,
             y: touch.last_pos.1 as f32,
         };
 
         let event = iced::Event::Touch(iced::touch::Event::FingerMoved { id, position });
-
         surface.widgets.queue_event(event);
     }
 
@@ -149,14 +155,17 @@ impl State {
             return;
         };
 
+        // HACK: Iced ignores the touch locations, so we're overriding the cursor position here.
+        // FIXME: Once iced gets correct touch handling, remove this.
+        surface.pointer_location = Some(touch.last_pos);
+
         let id = iced::touch::Finger(touch.id as u64);
         let position = iced::Point {
             x: touch.last_pos.0 as f32,
             y: touch.last_pos.1 as f32,
         };
 
         let event = iced::Event::Touch(iced::touch::Event::FingerLifted { id, position });
-
         surface.widgets.queue_event(event);
     }
 
@@ -178,7 +187,6 @@ impl State {
             };
 
             let event = iced::Event::Touch(iced::touch::Event::FingerLost { id, position });
-
             surface.widgets.queue_event(event);
         }
     }