diff --git a/Cargo.toml b/Cargo.toml index e0a0b4034..86a952e7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,6 @@ html = ["dioxus-html"] ssr = ["dioxus-ssr"] web = ["dioxus-web", "dioxus-router/web"] desktop = ["dioxus-desktop"] -ayatana = ["dioxus-desktop/ayatana"] router = ["dioxus-router"] tui = ["dioxus-tui"] liveview = ["dioxus-liveview"] diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index 912a29abf..e61120d64 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -20,7 +20,7 @@ serde = "1.0.136" serde_json = "1.0.79" thiserror = "1.0.30" log = "0.4.14" -wry = { version = "0.13.1" } +wry = { version = "0.16.0" } futures-channel = "0.3.21" tokio = { version = "1.16.1", features = [ "sync", @@ -28,7 +28,7 @@ tokio = { version = "1.16.1", features = [ "rt", "time", ], optional = true, default-features = false } -webbrowser = "0.6.0" +webbrowser = "0.7.1" mime_guess = "2.0.3" dunce = "1.0.2" @@ -38,13 +38,9 @@ core-foundation = "0.9.3" [features] default = ["tokio_runtime"] tokio_runtime = ["tokio"] - -devtool = ["wry/devtool"] fullscreen = ["wry/fullscreen"] transparent = ["wry/transparent"] - tray = ["wry/tray"] -ayatana = ["wry/ayatana"] [dev-dependencies] diff --git a/packages/desktop/src/desktop_context.rs b/packages/desktop/src/desktop_context.rs index 155f7af1b..0b37910b0 100644 --- a/packages/desktop/src/desktop_context.rs +++ b/packages/desktop/src/desktop_context.rs @@ -191,7 +191,7 @@ pub(super) fn handler( SetTitle(content) => window.set_title(&content), SetDecorations(state) => window.set_decorations(state), - DevTool => webview.devtool(), + DevTool => {} Eval(code) => webview .evaluate_script(code.as_str()) diff --git a/packages/desktop/src/lib.rs b/packages/desktop/src/lib.rs index 1e3898f05..160ed7d43 100644 --- a/packages/desktop/src/lib.rs +++ b/packages/desktop/src/lib.rs @@ -200,7 +200,7 @@ pub fn launch_with_props( ) } else { // in debug, we are okay with the reload menu showing and dev tool - webview = webview.with_dev_tool(true); + webview = webview.with_devtools(true); } desktop.webviews.insert(window_id, webview.build().unwrap());