From 8af69be47e88896b3c5f70174db609eee0c67971 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 06:23:40 +0100
Subject: Converge `Command` types from `iced_futures` and `iced_native`

---
 native/src/command/action.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'native/src/command/action.rs')

diff --git a/native/src/command/action.rs b/native/src/command/action.rs
index d1589c05..6c74f0ef 100644
--- a/native/src/command/action.rs
+++ b/native/src/command/action.rs
@@ -1,7 +1,7 @@
 use crate::clipboard;
+use crate::core::widget;
 use crate::font;
 use crate::system;
-use crate::widget;
 use crate::window;
 
 use iced_futures::MaybeSend;
@@ -28,7 +28,7 @@ pub enum Action<T> {
     System(system::Action<T>),
 
     /// Run a widget action.
-    Widget(widget::Action<T>),
+    Widget(Box<dyn widget::Operation<T>>),
 
     /// Load a font from its bytes.
     LoadFont {
@@ -59,7 +59,9 @@ impl<T> Action<T> {
             Self::Clipboard(action) => Action::Clipboard(action.map(f)),
             Self::Window(window) => Action::Window(window.map(f)),
             Self::System(system) => Action::System(system.map(f)),
-            Self::Widget(widget) => Action::Widget(widget.map(f)),
+            Self::Widget(operation) => {
+                Action::Widget(Box::new(widget::operation::map(operation, f)))
+            }
             Self::LoadFont { bytes, tagger } => Action::LoadFont {
                 bytes,
                 tagger: Box::new(move |result| f(tagger(result))),
-- 
cgit