From 79d0724da341176ba2b625b0a7c776d6c5a9b76a Mon Sep 17 00:00:00 2001 From: pan93412 Date: Sun, 20 Nov 2022 12:25:35 +0800 Subject: [PATCH 1/2] build: Switch wry to bleeding-edge release --- src-tauri/Cargo.lock | 141 +++++++++++++------------------------------ src-tauri/Cargo.toml | 5 +- 2 files changed, 45 insertions(+), 101 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 7e124cc..6b0c5d9 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ "tauri-build", "tauri-utils", "webbrowser", - "wry 0.21.1", + "wry 0.23.0", ] [[package]] @@ -1326,20 +1326,6 @@ dependencies = [ "system-deps 5.0.0", ] -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni" version = "0.20.0" @@ -2794,52 +2780,6 @@ dependencies = [ "version-compare 0.1.0", ] -[[package]] -name = "tao" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" -dependencies = [ - "bitflags", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics", - "crossbeam-channel", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image", - "instant", - "jni 0.19.0", - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "paste", - "png 0.17.7", - "raw-window-handle", - "scopeguard", - "serde", - "unicode-segmentation", - "uuid 1.2.1", - "windows 0.39.0", - "windows-implement", - "x11-dl", -] - [[package]] name = "tao" version = "0.15.2" @@ -2864,7 +2804,7 @@ dependencies = [ "gtk", "image", "instant", - "jni 0.20.0", + "jni", "lazy_static", "libc", "log", @@ -3480,7 +3420,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0cc7962b5aaa0dfcebaeef0161eec6edf5f4606c12e6777fd7d392f52033a5" dependencies = [ - "jni 0.20.0", + "jni", "ndk-context", "objc", "raw-window-handle", @@ -3836,42 +3776,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "wry" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" -dependencies = [ - "base64", - "block", - "cocoa", - "core-graphics", - "crossbeam-channel", - "gdk", - "gio", - "glib", - "gtk", - "html5ever", - "http", - "kuchiki", - "libc", - "log", - "objc", - "objc_id", - "once_cell", - "serde", - "serde_json", - "sha2", - "tao 0.14.0", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement", -] - [[package]] name = "wry" version = "0.22.0" @@ -3900,7 +3804,44 @@ dependencies = [ "serde_json", "sha2", "soup2", - "tao 0.15.2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "wry" +version = "0.23.0" +source = "git+https://github.com/tauri-apps/wry.git?rev=7c6d64acea4414f7c960b38b80ea9ec3628db2a8#7c6d64acea4414f7c960b38b80ea9ec3628db2a8" +dependencies = [ + "base64", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", "thiserror", "url", "webkit2gtk", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 74c3d4e..b71cf9c 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -20,10 +20,13 @@ serde_json = "1.0.86" serde = { version = "1.0.145", features = ["derive"] } tauri = { version = "1.2.0", features = ["api-all"] } image = "0.24.5" -wry = "0.21.1" tauri-utils = "1.2.0" webbrowser = "0.8.2" +[dependencies.wry] +git = "https://github.com/tauri-apps/wry.git" +rev = "7c6d64acea4414f7c960b38b80ea9ec3628db2a8" + [features] # by default Tauri runs in production mode # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL From 59a3a74d7b829790138196dc62b57ff938f6e031 Mon Sep 17 00:00:00 2001 From: pan93412 Date: Sun, 20 Nov 2022 12:26:09 +0800 Subject: [PATCH 2/2] feat: Allow navigating with gestures Resolved #81 --- src-tauri/src/main.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index a1c7e1a..7a42abb 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -44,7 +44,7 @@ use wry::{ fn main() -> wry::Result<()> { - + #[cfg(target_os = "macos")] let mut menu_bar_menu = Menu::new(); #[cfg(target_os = "macos")] @@ -139,7 +139,7 @@ fn main() -> wry::Result<()> { let window = common_window .with_title("") .build(&event_loop) - .unwrap(); + .unwrap(); #[cfg(target_os = "macos")] let window = common_window @@ -165,12 +165,13 @@ fn main() -> wry::Result<()> { webbrowser::open(&href).expect("no browser"); } }; - + let webview = WebViewBuilder::new(window)? .with_url(&url.to_string())? .with_devtools(cfg!(feature = "devtools")) .with_initialization_script(include_str!("pake.js")) .with_ipc_handler(handler) + .with_back_forward_navigation_gestures(true) .build()?;