diff --git a/packages/desktop/src/app.rs b/packages/desktop/src/app.rs index 15abc0d24..265991bea 100644 --- a/packages/desktop/src/app.rs +++ b/packages/desktop/src/app.rs @@ -91,16 +91,17 @@ impl App

{ window_event: &Event<'_, UserWindowEvent>, event_loop: &EventLoopWindowTarget, ) { - // Set the control flow here, but make sure to update it at the end of the match self.control_flow = ControlFlow::Wait; self.event_handlers.apply_event(window_event, event_loop); - if let Ok(event) = self.global_hotkey_channel.try_recv() { - self.shortcut_manager.call_handlers(event); - } + _ = self + .global_hotkey_channel + .try_recv() + .map(|event| self.shortcut_manager.call_handlers(event)); } + #[cfg(all(feature = "hot-reload", debug_assertions))] pub fn connect_hotreload(&mut self) { let proxy = self.proxy.clone(); dioxus_hot_reload::connect({ @@ -317,8 +318,7 @@ impl App

{ view.dom.handle_event(event_name, data, id, event_bubbles); } - todo!() - // send_edits(view.dom.render_immediate(), &view.desktop_context); + send_edits(view.dom.render_immediate(), &view.desktop_context); } } diff --git a/packages/desktop/src/webview.rs b/packages/desktop/src/webview.rs index 229fc3b9b..e1ec06269 100644 --- a/packages/desktop/src/webview.rs +++ b/packages/desktop/src/webview.rs @@ -97,10 +97,6 @@ pub(crate) fn build( webview = webview.with_background_color(color); } - // These are commented out because wry is currently broken in wry - // let mut web_context = WebContext::new(cfg.data_dir.clone()); - // .with_web_context(&mut web_context); - for (name, handler) in cfg.protocols.drain(..) { webview = webview.with_custom_protocol(name, move |r| handler(r)) } @@ -145,32 +141,36 @@ pub fn build_default_menu_bar() -> Menu { // since it is uncommon on windows to have an "application menu" // we add a "window" menu to be more consistent across platforms with the standard menu let window_menu = Submenu::new("Window", true); - window_menu.append_items(&[ - &PredefinedMenuItem::fullscreen(None), - &PredefinedMenuItem::separator(), - &PredefinedMenuItem::hide(None), - &PredefinedMenuItem::hide_others(None), - &PredefinedMenuItem::show_all(None), - &PredefinedMenuItem::maximize(None), - &PredefinedMenuItem::minimize(None), - &PredefinedMenuItem::close_window(None), - &PredefinedMenuItem::separator(), - &PredefinedMenuItem::quit(None), - ]); + window_menu + .append_items(&[ + &PredefinedMenuItem::fullscreen(None), + &PredefinedMenuItem::separator(), + &PredefinedMenuItem::hide(None), + &PredefinedMenuItem::hide_others(None), + &PredefinedMenuItem::show_all(None), + &PredefinedMenuItem::maximize(None), + &PredefinedMenuItem::minimize(None), + &PredefinedMenuItem::close_window(None), + &PredefinedMenuItem::separator(), + &PredefinedMenuItem::quit(None), + ]) + .unwrap(); let edit_menu = Submenu::new("Window", true); - edit_menu.append_items(&[ - &PredefinedMenuItem::undo(None), - &PredefinedMenuItem::redo(None), - &PredefinedMenuItem::separator(), - &PredefinedMenuItem::cut(None), - &PredefinedMenuItem::copy(None), - &PredefinedMenuItem::paste(None), - &PredefinedMenuItem::separator(), - &PredefinedMenuItem::select_all(None), - ]); + edit_menu + .append_items(&[ + &PredefinedMenuItem::undo(None), + &PredefinedMenuItem::redo(None), + &PredefinedMenuItem::separator(), + &PredefinedMenuItem::cut(None), + &PredefinedMenuItem::copy(None), + &PredefinedMenuItem::paste(None), + &PredefinedMenuItem::separator(), + &PredefinedMenuItem::select_all(None), + ]) + .unwrap(); - menu.append_items(&[&window_menu, &edit_menu]); + menu.append_items(&[&window_menu, &edit_menu]).unwrap(); menu }