Merge branch 'master' into router-typesafe

This commit is contained in:
Evan Almloff committed 2023-06-28 08:56:07 -07:00
1 parent 0600a1bb49
commit 7b1f0c9412
33 files changed
+370 -303

No files matched your search

+4
View File
@@ -64,6 +64,10 @@ pub fn build(
webview = webview.with_browser_accelerator_keys(false);
}
if let Some(color) = cfg.background_color {
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);