diff options
| author |  gigas002 <gigas002@pm.me> | 2024-05-08 19:16:20 +0900 |
|---|---|---|
| committer | gigas002 <gigas002@pm.me> | 2024-05-08 19:16:20 +0900 |
| commit | ff26fb7df43bd241253af85e0621e2cc030e9cec (patch) | |
| tree | 2b3272bb178f8757169511966589fe6a106733f4 /src/application.rs | |
| parent | 0ebe0629cef37aee5c48b9409fc36618a3a3e60d (diff) | |
| parent | 477887b3870aa5fbdab96c3a06f3b930462d7842 (diff) | |
| download | iced-ff26fb7df43bd241253af85e0621e2cc030e9cec.tar.gz iced-ff26fb7df43bd241253af85e0621e2cc030e9cec.tar.bz2 iced-ff26fb7df43bd241253af85e0621e2cc030e9cec.zip | |
Merge branch 'iced-rs-master' into viewer_content_fit
Diffstat (limited to 'src/application.rs')
| -rw-r--r-- | src/application.rs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/application.rs b/src/application.rs index 9197834b..d12ba73d 100644 --- a/src/application.rs +++ b/src/application.rs @@ -212,26 +212,11 @@ where ..crate::graphics::Settings::default() }; - let run = crate::shell::application::run::< + Ok(crate::shell::application::run::< Instance<Self>, Self::Executor, <Self::Renderer as compositor::Default>::Compositor, - >(settings.into(), renderer_settings); - - #[cfg(target_arch = "wasm32")] - { - use crate::futures::FutureExt; - use iced_futures::backend::wasm::wasm_bindgen::Executor; - - Executor::new() - .expect("Create Wasm executor") - .spawn(run.map(|_| ())); - - Ok(()) - } - - #[cfg(not(target_arch = "wasm32"))] - Ok(crate::futures::executor::block_on(run)?) + >(settings.into(), renderer_settings)?) } } |