From 3bdf931925067acbaabf040f6c437a54640ed1a0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 15 Dec 2020 06:38:46 +0100
Subject: Turn `Touch` into a `touch::Event` enum

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

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

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 7d5eb30c..8e2450de 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -4,7 +4,7 @@
 use crate::event::{self, Event};
 use crate::layout;
 use crate::mouse;
-use crate::touch::{self, Touch};
+use crate::touch;
 use crate::{
     Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Widget,
 };
@@ -166,10 +166,7 @@ where
     ) -> event::Status {
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(Touch {
-                phase: touch::Phase::Started,
-                ..
-            }) => {
+            | Event::Touch(touch::Event::FingerPressed { .. }) => {
                 if self.on_press.is_some() {
                     let bounds = layout.bounds();
 
@@ -181,10 +178,7 @@ where
                 }
             }
             Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
-            | Event::Touch(Touch {
-                phase: touch::Phase::Ended,
-                ..
-            }) => {
+            | Event::Touch(touch::Event::FingerLifted { .. }) => {
                 if let Some(on_press) = self.on_press.clone() {
                     let bounds = layout.bounds();
 
@@ -199,10 +193,7 @@ where
                     }
                 }
             }
-            Event::Touch(Touch {
-                phase: touch::Phase::Canceled,
-                ..
-            }) => {
+            Event::Touch(touch::Event::FingerLost { .. }) => {
                 self.state.is_pressed = false;
             }
             _ => {}
-- 
cgit