Merge pull request #1019 from hecrj/command-actions

Platform-specific `Command` implementations

5 files changed, 19 insertions, 32 deletions

diff --git a/src/application.rs b/src/application.rs
index 78280e98..0c30a554 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -1,7 +1,5 @@
 use crate::window;
-use crate::{
-    Clipboard, Color, Command, Element, Executor, Menu, Settings, Subscription,
-};
+use crate::{Color, Command, Element, Executor, Menu, Settings, Subscription};
 
 /// An interactive cross-platform application.
 ///
@@ -59,7 +57,7 @@ use crate::{
 /// says "Hello, world!":
 ///
 /// ```no_run
-/// use iced::{executor, Application, Clipboard, Command, Element, Settings, Text};
+/// use iced::{executor, Application, Command, Element, Settings, Text};
 ///
 /// pub fn main() -> iced::Result {
 ///     Hello::run(Settings::default())
@@ -80,7 +78,7 @@ use crate::{
 ///         String::from("A cool application")
 ///     }
 ///
-///     fn update(&mut self, _message: Self::Message, _clipboard: &mut Clipboard) -> Command<Self::Message> {
+///     fn update(&mut self, _message: Self::Message) -> Command<Self::Message> {
 ///         Command::none()
 ///     }
 ///
@@ -129,11 +127,7 @@ pub trait Application: Sized {
     /// this method.
     ///
     /// Any [`Command`] returned will be executed immediately in the background.
-    fn update(
-        &mut self,
-        message: Self::Message,
-        clipboard: &mut Clipboard,
-    ) -> Command<Self::Message>;
+    fn update(&mut self, message: Self::Message) -> Command<Self::Message>;
 
     /// Returns the event [`Subscription`] for the current state of the
     /// application.
@@ -249,14 +243,9 @@ where
 {
     type Renderer = crate::renderer::Renderer;
     type Message = A::Message;
-    type Clipboard = iced_winit::Clipboard;
-
-    fn update(
-        &mut self,
-        message: Self::Message,
-        clipboard: &mut iced_winit::Clipboard,
-    ) -> Command<Self::Message> {
-        self.0.update(message, clipboard)
+
+    fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
+        self.0.update(message)
     }
 
     fn view(&mut self) -> Element<'_, Self::Message> {
@@ -329,12 +318,8 @@ where
         self.0.title()
     }
 
-    fn update(
-        &mut self,
-        message: Self::Message,
-        clipboard: &mut Clipboard,
-    ) -> Command<Self::Message> {
-        self.0.update(message, clipboard)
+    fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
+        self.0.update(message)
     }
 
     fn subscription(&self) -> Subscription<Self::Message> {
diff --git a/src/clipboard.rs b/src/clipboard.rs
new file mode 100644
index 00000000..dde17051
--- /dev/null
+++ b/src/clipboard.rs
@@ -0,0 +1,3 @@
+//! Access the clipboard.
+#[cfg(not(target_arch = "wasm32"))]
+pub use crate::runtime::clipboard::{read, write};
diff --git a/src/lib.rs b/src/lib.rs
index 8cd6aa70..e4f00c07 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -183,6 +183,7 @@ mod error;
 mod result;
 mod sandbox;
 
+pub mod clipboard;
 pub mod executor;
 pub mod keyboard;
 pub mod mouse;
@@ -245,7 +246,7 @@ pub use sandbox::Sandbox;
 pub use settings::Settings;
 
 pub use runtime::{
-    futures, menu, Align, Background, Clipboard, Color, Command, Font,
+    futures, menu, Align, Background, Color, Command, Font,
     HorizontalAlignment, Length, Menu, Point, Rectangle, Size, Subscription,
     Vector, VerticalAlignment,
 };
diff --git a/src/sandbox.rs b/src/sandbox.rs
index cb3cf624..a0bb316e 100644
--- a/src/sandbox.rs
+++ b/src/sandbox.rs
@@ -1,6 +1,5 @@
 use crate::{
-    Application, Clipboard, Color, Command, Element, Error, Settings,
-    Subscription,
+    Application, Color, Command, Element, Error, Settings, Subscription,
 };
 
 /// A sandboxed [`Application`].
@@ -162,11 +161,7 @@ where
         T::title(self)
     }
 
-    fn update(
-        &mut self,
-        message: T::Message,
-        _clipboard: &mut Clipboard,
-    ) -> Command<T::Message> {
+    fn update(&mut self, message: T::Message) -> Command<T::Message> {
         T::update(self, message);
 
         Command::none()
diff --git a/src/window.rs b/src/window.rs
index 7d441062..71158816 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -9,3 +9,6 @@ pub use icon::Icon;
 pub use mode::Mode;
 pub use position::Position;
 pub use settings::Settings;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use crate::runtime::window::{move_to, resize};