me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Connect iced_web with iced properly

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-10-23 02:33:07 +02:00
parent 871eb41430
commit c7ef9d0da7
5 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
web/Cargo.toml
View file

@ -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"

13
web/src/lib.rs
View file

@ -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);
}
}