Merge branch 'master' into breaking
This commit is contained in:
29 files changed
+684
-258
No files matched your search
@@ -64,7 +64,7 @@ mod impl_ {
|
||||
])
|
||||
.unwrap();
|
||||
|
||||
let edit_menu = Submenu::new("Window", true);
|
||||
let edit_menu = Submenu::new("Edit", true);
|
||||
edit_menu
|
||||
.append_items(&[
|
||||
&PredefinedMenuItem::undo(None),
|
||||
|
||||
@@ -91,7 +91,28 @@ impl WebviewInstance {
|
||||
}
|
||||
};
|
||||
|
||||
let mut webview = WebViewBuilder::new(&window)
|
||||
#[cfg(any(
|
||||
target_os = "windows",
|
||||
target_os = "macos",
|
||||
target_os = "ios",
|
||||
target_os = "android"
|
||||
))]
|
||||
let mut webview = WebViewBuilder::new(&window);
|
||||
|
||||
#[cfg(not(any(
|
||||
target_os = "windows",
|
||||
target_os = "macos",
|
||||
target_os = "ios",
|
||||
target_os = "android"
|
||||
)))]
|
||||
let mut webview = {
|
||||
use tao::platform::unix::WindowExtUnix;
|
||||
use wry::WebViewBuilderExtUnix;
|
||||
let vbox = window.default_vbox().unwrap();
|
||||
WebViewBuilder::new_gtk(vbox)
|
||||
};
|
||||
|
||||
webview = webview
|
||||
.with_transparent(cfg.window.window.transparent)
|
||||
.with_url("dioxus://index.html/")
|
||||
.unwrap()
|
||||
|
||||
Reference in new issue
Block a user