From b5b17ed4d800c03beb3ad535d1069a7784e8dc1d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 19 Jan 2020 10:17:08 +0100
Subject: Create `iced_futures` and wire everything up
---
web/Cargo.toml | 9 ++++++++-
web/src/lib.rs | 6 +++---
web/src/subscription.rs | 4 ++--
3 files changed, 13 insertions(+), 6 deletions(-)
(limited to 'web')
diff --git a/web/Cargo.toml b/web/Cargo.toml
index 605c7462..ea092575 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -15,12 +15,19 @@ categories = ["web-programming"]
maintenance = { status = "actively-developed" }
[dependencies]
-iced_core = { version = "0.1.0", path = "../core", features = ["command", "subscription"] }
dodrio = "0.1.0"
wasm-bindgen = "0.2.51"
wasm-bindgen-futures = "0.4"
futures = "0.3"
+[dependencies.iced_core]
+version = "0.1.0"
+path = "../core"
+
+[dependencies.iced_futures]
+version = "0.1.0-alpha"
+path = "../futures"
+
[dependencies.web-sys]
version = "0.3.27"
features = [
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;
--
cgit