Merge branch 'master' into jk/templates-v3

This commit is contained in:
Jonathan Kelley committed 2022-11-16 22:12:16 -08:00
commit c1c5821dcf
9 files changed
+36 -86

No files matched your search

+7 -1
View File
@@ -182,7 +182,13 @@ pub(super) fn handler(
) {
// currently dioxus-desktop supports a single window only,
// so we can grab the only webview from the map;
let webview = desktop.webviews.values().next().unwrap();
// on wayland it is possible that a user event is emitted
// before the webview is initialized. ignore the event.
let webview = if let Some(webview) = desktop.webviews.values().next() {
webview
} else {
return;
};
let window = webview.window();
println!("user_event: {:?}", user_event);
-2
View File
@@ -18,8 +18,6 @@ pub(super) fn desktop_handler(
custom_head: Option<String>,
custom_index: Option<String>,
) -> Result<Response<Vec<u8>>> {
println!("loading request: {:?}", request.uri());
// Any content that uses the `dioxus://` scheme will be shuttled through this handler as a "special case".
// For now, we only serve two pieces of content which get included as bytes into the final binary.
let path = request.uri().to_string().replace("dioxus://", "");