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

---
 native/src/widget/slider.rs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'native/src/widget/slider.rs')

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index 008203fe..95f63921 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -5,7 +5,7 @@
 //! [`Slider`]: struct.Slider.html
 //! [`State`]: struct.State.html
 use crate::{
-    input::{mouse, ButtonState},
+    input::{mouse, touch::Touch, ButtonState},
     layout, Clipboard, Element, Event, Hasher, Layout, Length, Point,
     Rectangle, Size, Widget,
 };
@@ -166,19 +166,23 @@ where
         match event {
             Event::Mouse(mouse::Event::Input {
                 button: mouse::Button::Left,
-                state,
-            }) => match state {
-                ButtonState::Pressed => {
-                    if layout.bounds().contains(cursor_position) {
-                        change();
-                        self.state.is_dragging = true;
-                    }
-                }
-                ButtonState::Released => {
-                    self.state.is_dragging = false;
+                state: ButtonState::Pressed,
+            })
+            | Event::Touch(Touch::Started { .. }) => {
+                if layout.bounds().contains(cursor_position) {
+                    change();
+                    self.state.is_dragging = true;
                 }
-            },
-            Event::Mouse(mouse::Event::CursorMoved { .. }) => {
+            }
+            Event::Mouse(mouse::Event::Input {
+                button: mouse::Button::Left,
+                state: ButtonState::Released,
+            })
+            | Event::Touch(Touch::Ended { .. }) => {
+                self.state.is_dragging = false;
+            }
+            Event::Mouse(mouse::Event::CursorMoved { .. })
+            | Event::Touch(Touch::Moved { .. }) => {
                 if self.state.is_dragging {
                     change();
                 }
-- 
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

---
 native/src/widget/slider.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'native/src/widget/slider.rs')

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index 95f63921..c98cebb6 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -5,7 +5,7 @@
 //! [`Slider`]: struct.Slider.html
 //! [`State`]: struct.State.html
 use crate::{
-    input::{mouse, touch::Touch, ButtonState},
+    input::{mouse, touch, ButtonState, Touch},
     layout, Clipboard, Element, Event, Hasher, Layout, Length, Point,
     Rectangle, Size, Widget,
 };
@@ -168,7 +168,10 @@ where
                 button: mouse::Button::Left,
                 state: ButtonState::Pressed,
             })
-            | Event::Touch(Touch::Started { .. }) => {
+            | Event::Touch(Touch {
+                phase: touch::Phase::Started,
+                ..
+            }) => {
                 if layout.bounds().contains(cursor_position) {
                     change();
                     self.state.is_dragging = true;
@@ -178,11 +181,17 @@ where
                 button: mouse::Button::Left,
                 state: ButtonState::Released,
             })
-            | Event::Touch(Touch::Ended { .. }) => {
+            | Event::Touch(Touch {
+                phase: touch::Phase::Ended,
+                ..
+            }) => {
                 self.state.is_dragging = false;
             }
             Event::Mouse(mouse::Event::CursorMoved { .. })
-            | Event::Touch(Touch::Moved { .. }) => {
+            | Event::Touch(Touch {
+                phase: touch::Phase::Moved,
+                ..
+            }) => {
                 if self.state.is_dragging {
                     change();
                 }
-- 
cgit