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/button.rs | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

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

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 8c397bc1..81dbe7c5 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -5,7 +5,7 @@
 //! [`Button`]: struct.Button.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, Widget,
 };
@@ -189,16 +189,24 @@ where
                 button: mouse::Button::Left,
                 state: ButtonState::Pressed,
             })
-            | Event::Touch(Touch::Started { .. }) => {
-                let bounds = layout.bounds();
+            | Event::Touch(Touch {
+                phase: touch::Phase::Started,
+                ..
+            }) => {
+                if self.on_press.is_some() {
+                    let bounds = layout.bounds();
 
-                self.state.is_pressed = bounds.contains(cursor_position);
+                    self.state.is_pressed = bounds.contains(cursor_position);
+                }
             }
             Event::Mouse(mouse::Event::Input {
                 button: mouse::Button::Left,
                 state: ButtonState::Released,
             })
-            | Event::Touch(Touch::Ended { .. }) => {
+            | Event::Touch(Touch {
+                phase: touch::Phase::Ended,
+                ..
+            }) => {
                 if let Some(on_press) = self.on_press.clone() {
                     let bounds = layout.bounds();
                     let is_clicked = self.state.is_pressed
@@ -211,6 +219,12 @@ where
                     }
                 }
             }
+            Event::Touch(Touch {
+                phase: touch::Phase::Canceled,
+                ..
+            }) => {
+                self.state.is_pressed = false;
+            }
             _ => {}
         }
     }
-- 
cgit