summaryrefslogtreecommitdiffstats
path: root/native/src/program
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--native/src/program.rs13
-rw-r--r--native/src/program/state.rs9
2 files changed, 14 insertions, 8 deletions
diff --git a/native/src/program.rs b/native/src/program.rs
index 9ee72703..75fab094 100644
--- a/native/src/program.rs
+++ b/native/src/program.rs
@@ -1,5 +1,5 @@
//! Build interactive programs using The Elm Architecture.
-use crate::{Command, Element, Renderer};
+use crate::{Clipboard, Command, Element, Renderer};
mod state;
@@ -11,7 +11,10 @@ pub trait Program: Sized {
type Renderer: Renderer;
/// The type of __messages__ your [`Program`] will produce.
- type Message: std::fmt::Debug + Send;
+ type Message: std::fmt::Debug + Clone + Send;
+
+ /// The type of [`Clipboard`] your [`Program`] will use.
+ type Clipboard: Clipboard;
/// Handles a __message__ and updates the state of the [`Program`].
///
@@ -21,7 +24,11 @@ pub trait Program: Sized {
///
/// Any [`Command`] returned will be executed immediately in the
/// background by shells.
- fn update(&mut self, message: Self::Message) -> Command<Self::Message>;
+ fn update(
+ &mut self,
+ message: Self::Message,
+ clipboard: &mut Self::Clipboard,
+ ) -> Command<Self::Message>;
/// Returns the widgets to display in the [`Program`].
///
diff --git a/native/src/program/state.rs b/native/src/program/state.rs
index e630890a..fd1f2b52 100644
--- a/native/src/program/state.rs
+++ b/native/src/program/state.rs
@@ -1,6 +1,5 @@
use crate::{
- Cache, Clipboard, Command, Debug, Event, Point, Program, Renderer, Size,
- UserInterface,
+ Cache, Command, Debug, Event, Point, Program, Renderer, Size, UserInterface,
};
/// The execution state of a [`Program`]. It leverages caching, event
@@ -91,8 +90,8 @@ where
&mut self,
bounds: Size,
cursor_position: Point,
- clipboard: Option<&dyn Clipboard>,
renderer: &mut P::Renderer,
+ clipboard: &mut P::Clipboard,
debug: &mut Debug,
) -> Option<Command<P::Message>> {
let mut user_interface = build_user_interface(
@@ -109,8 +108,8 @@ where
let _ = user_interface.update(
&self.queued_events,
cursor_position,
- clipboard,
renderer,
+ clipboard,
&mut messages,
);
@@ -136,7 +135,7 @@ where
debug.log_message(&message);
debug.update_started();
- let command = self.program.update(message);
+ let command = self.program.update(message, clipboard);
debug.update_finished();
command