Tiny bit of cleanups

This commit is contained in:
Jonathan Kelley committed 2024-01-04 16:36:19 -08:00
1 parent 436635386d
commit d38ce349b1
2 files changed
+33 -33

No files matched your search

+6 -6
View File
@@ -91,16 +91,17 @@ impl<P: 'static> App<P> {
window_event: &Event<'_, UserWindowEvent>,
event_loop: &EventLoopWindowTarget<UserWindowEvent>,
) {
// 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<P: 'static> App<P> {
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);
}
}
+27 -27
View File
@@ -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
}