From e19a07d40049f40f36d879a498fab4ce63778b27 Mon Sep 17 00:00:00 2001
From: Sebastian Imlay <sebastian.imlay@gmail.com>
Date: Mon, 11 Nov 2019 20:29:58 -0800
Subject: Added initial touch events to support iOS

---
 winit/src/application.rs |  1 -
 winit/src/conversion.rs  | 26 +++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'winit/src')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index 891b8f12..65bffd5b 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -310,7 +310,6 @@ pub trait Application: Sized {
                         physical_size.width,
                         physical_size.height,
                     );
-
                     resized = false;
                 }
 
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index b6a0b64b..2fc76c9d 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -5,7 +5,7 @@
 use crate::{
     input::{
         keyboard::{self, KeyCode, ModifiersState},
-        mouse, ButtonState,
+        mouse, touch, ButtonState,
     },
     window, Event, Mode, MouseCursor,
 };
@@ -84,6 +84,9 @@ pub fn window_event(
         WindowEvent::HoveredFileCancelled => {
             Some(Event::Window(window::Event::FilesHoveredLeft))
         }
+        WindowEvent::Touch(touch) => {
+            Some(Event::Touch(touch_event(touch)))
+        }
         _ => None,
     }
 }
@@ -342,3 +345,24 @@ pub(crate) fn is_private_use_character(c: char) -> bool {
         _ => false,
     }
 }
+pub(crate) fn touch_event(touch: winit::event::Touch) -> touch::Touch {
+    let location = touch.location;
+    match touch.phase {
+        winit::event::TouchPhase::Started => touch::Touch::Started {
+            x: location.x as f32,
+            y: location.y as f32,
+        },
+        winit::event::TouchPhase::Ended => touch::Touch::Ended {
+            x: location.x as f32,
+            y: location.y as f32,
+        },
+        winit::event::TouchPhase::Moved => touch::Touch::Moved {
+            x: location.x as f32,
+            y: location.y as f32,
+        },
+        winit::event::TouchPhase::Cancelled => touch::Touch::Cancelled {
+            x: location.x as f32,
+            y: location.y as f32,
+        },
+    }
+}
-- 
cgit 


From d3572e1b819ff4d40de4f39f48eab71b9d0d4d5e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 19 Mar 2020 12:17:16 +0100
Subject: Turn `Touch` into a struct and add finger id

---
 winit/src/conversion.rs | 51 ++++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

(limited to 'winit/src')

diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 2fc76c9d..1d008d05 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -5,9 +5,9 @@
 use crate::{
     input::{
         keyboard::{self, KeyCode, ModifiersState},
-        mouse, touch, ButtonState,
+        mouse, touch, ButtonState, Touch,
     },
-    window, Event, Mode, MouseCursor,
+    window, Event, Mode, MouseCursor, Point,
 };
 
 /// Converts a winit window event into an iced event.
@@ -31,8 +31,7 @@ pub fn window_event(
             let position = position.to_logical::<f64>(scale_factor);
 
             Some(Event::Mouse(mouse::Event::CursorMoved {
-                x: position.x as f32,
-                y: position.y as f32,
+                position: Point::new(position.x as f32, position.y as f32),
             }))
         }
         WindowEvent::MouseInput { button, state, .. } => {
@@ -84,9 +83,7 @@ pub fn window_event(
         WindowEvent::HoveredFileCancelled => {
             Some(Event::Window(window::Event::FilesHoveredLeft))
         }
-        WindowEvent::Touch(touch) => {
-            Some(Event::Touch(touch_event(touch)))
-        }
+        WindowEvent::Touch(touch) => Some(Event::Touch(touch_event(touch))),
         _ => None,
     }
 }
@@ -162,6 +159,25 @@ pub fn modifiers_state(
     }
 }
 
+/// Converts a `Touch` from [`winit`] to an [`iced_native`] touch event.
+///
+/// [`winit`]: https://github.com/rust-windowing/winit
+/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
+pub fn touch_event(touch: winit::event::Touch) -> Touch {
+    let phase = match touch.phase {
+        winit::event::TouchPhase::Started => touch::Phase::Started,
+        winit::event::TouchPhase::Moved => touch::Phase::Moved,
+        winit::event::TouchPhase::Ended => touch::Phase::Ended,
+        winit::event::TouchPhase::Cancelled => touch::Phase::Canceled,
+    };
+
+    Touch {
+        finger: touch::Finger(touch.id),
+        position: Point::new(touch.location.x as f32, touch.location.y as f32),
+        phase,
+    }
+}
+
 /// Converts a `VirtualKeyCode` from [`winit`] to an [`iced_native`] key code.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
@@ -345,24 +361,3 @@ pub(crate) fn is_private_use_character(c: char) -> bool {
         _ => false,
     }
 }
-pub(crate) fn touch_event(touch: winit::event::Touch) -> touch::Touch {
-    let location = touch.location;
-    match touch.phase {
-        winit::event::TouchPhase::Started => touch::Touch::Started {
-            x: location.x as f32,
-            y: location.y as f32,
-        },
-        winit::event::TouchPhase::Ended => touch::Touch::Ended {
-            x: location.x as f32,
-            y: location.y as f32,
-        },
-        winit::event::TouchPhase::Moved => touch::Touch::Moved {
-            x: location.x as f32,
-            y: location.y as f32,
-        },
-        winit::event::TouchPhase::Cancelled => touch::Touch::Cancelled {
-            x: location.x as f32,
-            y: location.y as f32,
-        },
-    }
-}
-- 
cgit