Merge pull request #164 from hecrj/feature/custom-runtime

Custom futures executor with `iced_futures`

1 files changed, 25 insertions, 31 deletions

diff --git a/src/native.rs b/src/widget.rs
index 35441a3e..7d3a1cef 100644
--- a/src/native.rs
+++ b/src/widget.rs
@@ -1,27 +1,23 @@
-pub use iced_winit::{
-    Align, Background, Color, Command, Font, HorizontalAlignment, Length,
-    Space, Subscription, Vector, VerticalAlignment,
-};
-
-pub mod widget {
-    //! Display information and interactive controls in your application.
-    //!
-    //! # Re-exports
-    //! For convenience, the contents of this module are available at the root
-    //! module. Therefore, you can directly type:
-    //!
-    //! ```
-    //! use iced::{button, Button};
-    //! ```
-    //!
-    //! # Stateful widgets
-    //! Some widgets need to keep track of __local state__.
-    //!
-    //! These widgets have their own module with a `State` type. For instance, a
-    //! [`TextInput`] has some [`text_input::State`].
-    //!
-    //! [`TextInput`]: text_input/struct.TextInput.html
-    //! [`text_input::State`]: text_input/struct.State.html
+//! Display information and interactive controls in your application.
+//!
+//! # Re-exports
+//! For convenience, the contents of this module are available at the root
+//! module. Therefore, you can directly type:
+//!
+//! ```
+//! use iced::{button, Button};
+//! ```
+//!
+//! # Stateful widgets
+//! Some widgets need to keep track of __local state__.
+//!
+//! These widgets have their own module with a `State` type. For instance, a
+//! [`TextInput`] has some [`text_input::State`].
+//!
+//! [`TextInput`]: text_input/struct.TextInput.html
+//! [`text_input::State`]: text_input/struct.State.html
+#[cfg(not(target_arch = "wasm32"))]
+mod platform {
     pub use iced_wgpu::widget::*;
 
     pub mod image {
@@ -56,11 +52,9 @@ pub mod widget {
         iced_winit::Row<'a, Message, iced_wgpu::Renderer>;
 }
 
-#[doc(no_inline)]
-pub use widget::*;
+#[cfg(target_arch = "wasm32")]
+mod platform {
+    pub use iced_web::widget::*;
+}
 
-/// A generic widget.
-///
-/// This is an alias of an `iced_native` element with a default `Renderer`.
-pub type Element<'a, Message> =
-    iced_winit::Element<'a, Message, iced_wgpu::Renderer>;
+pub use platform::*;