diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-19 10:17:08 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-19 10:17:44 +0100 |
| commit | b5b17ed4d800c03beb3ad535d1069a7784e8dc1d (patch) | |
| tree | b9e6477bd11bd6784f8ee61e818b5f5ff1a44318 /web/src | |
| parent | d50ff9b5d97d9c3d6c6c70a9b4efe764b6126c86 (diff) | |
| download | iced-b5b17ed4d800c03beb3ad535d1069a7784e8dc1d.tar.gz iced-b5b17ed4d800c03beb3ad535d1069a7784e8dc1d.tar.bz2 iced-b5b17ed4d800c03beb3ad535d1069a7784e8dc1d.zip | |
Create `iced_futures` and wire everything up
Diffstat (limited to '')
| -rw-r--r-- | web/src/lib.rs | 6 | ||||
| -rw-r--r-- | web/src/subscription.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/web/src/lib.rs b/web/src/lib.rs index 7ea22e85..b183c390 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -72,9 +72,10 @@ pub use dodrio; pub use element::Element; pub use hasher::Hasher; pub use iced_core::{ - Align, Background, Color, Command, Font, HorizontalAlignment, Length, + Align, Background, Color, Font, HorizontalAlignment, Length, VerticalAlignment, }; +pub use iced_futures::Command; pub use style::Style; pub use subscription::Subscription; pub use widget::*; @@ -148,7 +149,6 @@ pub trait Application { } } - struct Instance<Message> { title: String, ui: Rc<RefCell<Box<dyn Application<Message = Message>>>>, @@ -167,7 +167,7 @@ impl<Message> Clone for Instance<Message> { impl<Message> Instance<Message> where - Message: 'static + Message: 'static, { fn new(ui: impl Application<Message = Message> + 'static) -> Self { Self { diff --git a/web/src/subscription.rs b/web/src/subscription.rs index 4638c8ab..6b8415c0 100644 --- a/web/src/subscription.rs +++ b/web/src/subscription.rs @@ -14,6 +14,6 @@ use crate::Hasher; /// /// [`Command`]: ../struct.Command.html /// [`Subscription`]: struct.Subscription.html -pub type Subscription<T> = iced_core::Subscription<Hasher, (), T>; +pub type Subscription<T> = iced_futures::Subscription<Hasher, (), T>; -pub use iced_core::subscription::Recipe; +pub use iced_futures::subscription::Recipe; |