djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make use of AppRunnerRef

Browse source 
Follow-up to #1650
This commit is contained in:
Emil Ernerfeldt 2022-08-02 17:37:12 +02:00
parent 64496cacb9
commit 263c9bd601
3 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
eframe/src/lib.rs
View file

@ -76,12 +76,6 @@ pub use epi::*;
// ----------------------------------------------------------------------------
// When compiling for web
#[cfg(target_arch = "wasm32")]
use egui::mutex::Mutex;
#[cfg(target_arch = "wasm32")]
use std::sync::Arc;
#[cfg(target_arch = "wasm32")]
pub mod web;
@ -89,7 +83,8 @@ pub mod web;
pub use wasm_bindgen;
#[cfg(target_arch = "wasm32")]
use web::AppRunner;
use web::AppRunnerRef;
#[cfg(target_arch = "wasm32")]
pub use web_sys;
@ -107,7 +102,7 @@ pub use web_sys;
/// /// You can add more callbacks like this if you want to call in to your code.
/// #[cfg(target_arch = "wasm32")]
/// #[wasm_bindgen]
/// pub fn start(canvas_id: &str) -> Result<Arc<Mutex<AppRunner>>, eframe::wasm_bindgen::JsValue> {
/// pub fn start(canvas_id: &str) -> Result<AppRunnerRef>, eframe::wasm_bindgen::JsValue> {
/// let web_options = eframe::WebOptions::default();
/// eframe::start_web(canvas_id, web_options, Box::new(|cc| Box::new(MyEguiApp::new(cc))))
/// }
@ -117,7 +112,7 @@ pub fn start_web(
canvas_id: &str,
web_options: WebOptions,
app_creator: AppCreator,
) -> Result<Arc<Mutex<AppRunner>>, wasm_bindgen::JsValue> {
) -> Result<AppRunnerRef, wasm_bindgen::JsValue> {
let handle = web::start(canvas_id, web_options, app_creator)?;
Ok(handle)

2
eframe/src/web/mod.rs
View file

@ -11,7 +11,6 @@ pub mod storage;
mod text_agent;
pub use backend::*;
use egui::Vec2;
pub use events::*;
pub use storage::*;
@ -21,6 +20,7 @@ use std::sync::{
Arc,
};
use egui::Vec2;
use wasm_bindgen::prelude::*;
use web_sys::EventTarget;

10
egui_demo_app/src/lib.rs
View file

@ -6,13 +6,7 @@ pub(crate) mod frame_history;
mod wrap_app;
#[cfg(target_arch = "wasm32")]
use std::sync::Arc;
#[cfg(target_arch = "wasm32")]
use eframe::web::AppRunner;
#[cfg(target_arch = "wasm32")]
use egui::mutex::Mutex;
use eframe::web::AppRunnerRef;
pub use wrap_app::WrapApp;
@ -31,7 +25,7 @@ use eframe::wasm_bindgen::{self, prelude::*};
#[cfg(target_arch = "wasm32")]
#[wasm_bindgen]
pub struct WebHandle {
handle: Arc<Mutex<AppRunner>>,
handle: AppRunnerRef,
}
#[cfg(target_arch = "wasm32")]