summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-23 02:33:07 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-23 02:33:07 +0200
commitc7ef9d0da705d8f27011fe41d2103c73aae42d2d (patch)
treebbd2baf6ac62426d278c8babef18e1cce49b3872 /web
parent871eb414303804233ed50d43bb9b98a7037cbd4c (diff)
downloadiced-c7ef9d0da705d8f27011fe41d2103c73aae42d2d.tar.gz
iced-c7ef9d0da705d8f27011fe41d2103c73aae42d2d.tar.bz2
iced-c7ef9d0da705d8f27011fe41d2103c73aae42d2d.zip
Connect `iced_web` with `iced` properly
Diffstat (limited to 'web')
-rw-r--r--web/Cargo.toml3
-rw-r--r--web/src/lib.rs13
2 files changed, 4 insertions, 12 deletions
diff --git a/web/Cargo.toml b/web/Cargo.toml
index d5a987b0..473bde17 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -17,8 +17,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
iced_core = { version = "0.1.0-alpha", path = "../core" }
dodrio = "0.1.0"
-futures-preview = "=0.3.0-alpha.18"
-wasm-bindgen = "0.2.50"
+wasm-bindgen = "0.2.51"
[dependencies.web-sys]
version = "0.3.27"
diff --git a/web/src/lib.rs b/web/src/lib.rs
index 04848d07..559a5af0 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -1,5 +1,4 @@
use dodrio::bumpalo;
-use futures::Future;
use std::cell::RefCell;
mod bus;
@@ -8,16 +7,13 @@ pub mod widget;
pub use bus::Bus;
pub use element::Element;
-pub use iced_core::{Align, Color, Justify, Length};
+pub use iced_core::{Align, Background, Color, Justify, Length};
pub use widget::*;
pub trait Application {
type Message;
- fn update(
- &mut self,
- message: Self::Message,
- ) -> Option<Box<dyn Future<Output = Self::Message>>>;
+ fn update(&mut self, message: Self::Message);
fn view(&mut self) -> Element<Self::Message>;
@@ -48,10 +44,7 @@ impl<Message> Instance<Message> {
}
fn update(&mut self, message: Message) {
- let mut ui = self.ui.borrow_mut();
-
- // TODO: Resolve futures and publish resulting messages
- let _ = ui.update(message);
+ self.ui.borrow_mut().update(message);
}
}