snowcap: use iced_touch instead of iced::widget for button & mouse_area

Author: Ph4ntomas

Cargo.lock

@@ -19,6 +19,9 @@ iced_renderer = "0.14.0"
 iced_runtime = "0.14.0"
 iced_tiny_skia = "0.14.0"
 iced_wgpu = "0.14.0"
+
+iced_touch = { git = "https://git.sr.ht/~phantomas/iced_touch", rev = "2eebdf33" }
+
 smithay-client-toolkit = "0.20.0"
 # iced = { path = "../../../git/iced", default-features = false, features = ["wgpu", "tokio", "tiny-skia", "image"] }
 # iced_wgpu = { path = "../../../git/iced/wgpu" }

snowcap/Cargo.toml

@@ -1,7 +1,9 @@
 use anyhow::Context;
 use iced::widget::{
-    Column, Container, Row, Scrollable, button, image::FilterMethod, scrollable::Scrollbar,
+    Column, Container, Row, Scrollable, image::FilterMethod, scrollable::Scrollbar,
 };
+use iced_touch::widget::{button, mouse_area};
+
 use snowcap_api_defs::snowcap::widget::{
     self,
     v1::{
@@ -534,7 +536,7 @@ pub fn widget_def_to_fn(def: WidgetDef) -> Option<ViewFn> {
             let child_widget_fn = child.and_then(|def| widget_def_to_fn(*def));
 
             let f: ViewFn = Box::new(move || {
-                let mut button = iced::widget::Button::new(
+                let mut button = button::Button::new(
                     child_widget_fn
                         .as_ref()
                         .map(|child| child())
@@ -738,7 +740,7 @@ pub fn widget_def_to_fn(def: WidgetDef) -> Option<ViewFn> {
             let child_widget_fn = child.and_then(|def| widget_def_to_fn(*def));
 
             let f: ViewFn = Box::new(move || {
-                let mut mouse_area = iced::widget::MouseArea::new(
+                let mut mouse_area = mouse_area::MouseArea::new(
                     child_widget_fn
                         .as_ref()
                         .map(|child| child())