diff --git a/.changes/macos-liquid-glass.md b/.changes/macos-liquid-glass.md index 2b85cd123..5939c65dd 100644 --- a/.changes/macos-liquid-glass.md +++ b/.changes/macos-liquid-glass.md @@ -4,4 +4,4 @@ tauri-utils: minor:enhance @tauri-apps/api: minor:enhance --- -Added `Regular` and `Clear` Liquid Glass window effects. +Added `Regular` and `Clear` Liquid Glass window effects. This also updated objc2 to `0.6.3` and its subcrates to `0.3.2`. diff --git a/Cargo.lock b/Cargo.lock index edae8bea6..db272a682 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5220,6 +5220,16 @@ dependencies = [ "objc2-core-foundation", ] +[[package]] +name = "objc2-javascript-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" +dependencies = [ + "objc2 0.6.3", + "objc2-core-foundation", +] + [[package]] name = "objc2-metal" version = "0.2.2" @@ -5258,9 +5268,9 @@ dependencies = [ [[package]] name = "objc2-security" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3126341c65c5d5728423ae95d788e1b660756486ad0592307ab87ba02d9a7268" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" dependencies = [ "bitflags 2.7.0", "objc2 0.6.3", @@ -5269,9 +5279,9 @@ dependencies = [ [[package]] name = "objc2-ui-kit" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777a571be14a42a3990d4ebedaeb8b54cd17377ec21b92e8200ac03797b3bee1" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ "bitflags 2.7.0", "objc2 0.6.3", @@ -5281,9 +5291,9 @@ dependencies = [ [[package]] name = "objc2-web-kit" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b717127e4014b0f9f3e8bba3d3f2acec81f1bde01f656823036e823ed2c94dce" +checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" dependencies = [ "bitflags 2.7.0", "block2 0.6.2", @@ -5291,6 +5301,7 @@ dependencies = [ "objc2-app-kit", "objc2-core-foundation", "objc2-foundation 0.3.2", + "objc2-javascript-core", "objc2-security", ] @@ -10374,9 +10385,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window-vibrancy" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9605566982065e4ca0f83c34724385b585d0afc60ab018a8faf6da601b242f" +checksum = "010797bd7c40396fbc59d3105089fed0885fe267a0ef4a0a4646df54e28647f6" dependencies = [ "objc2 0.6.3", "objc2-app-kit", diff --git a/crates/tauri-runtime-wry/Cargo.toml b/crates/tauri-runtime-wry/Cargo.toml index e247f3793..91b502006 100644 --- a/crates/tauri-runtime-wry/Cargo.toml +++ b/crates/tauri-runtime-wry/Cargo.toml @@ -43,11 +43,11 @@ webkit2gtk = { version = "=2.0", features = ["v2_40"] } percent-encoding = "2" [target.'cfg(target_vendor = "apple")'.dependencies] -objc2 = "0.6" +objc2 = "0.6.3" [target.'cfg(target_os = "macos")'.dependencies] -objc2-foundation = { version = "0.3", features = [] } -objc2-app-kit = { version = "0.3", features = [ +objc2-foundation = { version = "0.3.2", features = [] } +objc2-app-kit = { version = "0.3.2", features = [ "block2", "NSApplication", "NSResponder", diff --git a/crates/tauri-runtime/Cargo.toml b/crates/tauri-runtime/Cargo.toml index b269b8d32..6b75ca84a 100644 --- a/crates/tauri-runtime/Cargo.toml +++ b/crates/tauri-runtime/Cargo.toml @@ -50,16 +50,16 @@ webkit2gtk = { version = "=2.0", features = ["v2_40"] } jni = "0.21" [target.'cfg(all(target_vendor = "apple", not(target_os = "macos")))'.dependencies] -objc2 = "0.6" -objc2-ui-kit = { version = "0.3.0", default-features = false, features = [ +objc2 = "0.6.3" +objc2-ui-kit = { version = "0.3.2", default-features = false, features = [ "UIView", "UIResponder", ] } [target."cfg(target_os = \"macos\")".dependencies] url = "2" -objc2 = "0.6" -objc2-web-kit = { version = "0.3", features = ["objc2-app-kit", "WKWebView"] } +objc2 = "0.6.3" +objc2-web-kit = { version = "0.3.2", features = ["objc2-app-kit", "WKWebView"] } [features] devtools = [] diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml index 2ce23953e..c6f60d90a 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/tauri/Cargo.toml @@ -101,18 +101,18 @@ webkit2gtk = { version = "=2.0.1", features = ["v2_40"], optional = true } # darwin [target.'cfg(target_vendor = "apple")'.dependencies] -objc2 = "0.6" +objc2 = "0.6.3" # macOS [target.'cfg(target_os = "macos")'.dependencies] embed_plist = "1.2" plist = "1" -objc2-foundation = { version = "0.3", default-features = false, features = [ +objc2-foundation = { version = "0.3.2", default-features = false, features = [ "std", "NSData", "NSThread", ] } -objc2-app-kit = { version = "0.3", default-features = false, features = [ +objc2-app-kit = { version = "0.3.2", default-features = false, features = [ "std", "NSApplication", "NSColor", @@ -121,17 +121,17 @@ objc2-app-kit = { version = "0.3", default-features = false, features = [ "NSWindow", "NSImage", ] } -objc2-web-kit = { version = "0.3", features = [ +objc2-web-kit = { version = "0.3.2", features = [ "objc2-app-kit", "WKWebView", "WKUserContentController", ] } -window-vibrancy = "0.7" +window-vibrancy = "0.7.1" # windows [target."cfg(windows)".dependencies] webview2-com = { version = "0.38", optional = true } -window-vibrancy = "0.7" +window-vibrancy = "0.7.1" windows = { version = "0.61", features = [ "Win32_Foundation", "Win32_UI", diff --git a/packages/api/src/window.ts b/packages/api/src/window.ts index af82445b9..5eca6ed2f 100644 --- a/packages/api/src/window.ts +++ b/packages/api/src/window.ts @@ -1406,7 +1406,7 @@ class Window { } /** - * On macOS, Toggles a fullscreen mode that doesn’t require a new macOS space. Returns a boolean indicating whether the transition was successful (this won’t work if the window was already in the native fullscreen). + * On macOS, Toggles a fullscreen mode that doesn’t require a new macOS space. Returns a boolean indicating whether the transition was successful (this won't work if the window was already in the native fullscreen). * This is how fullscreen used to work on macOS in versions before Lion. And allows the user to have a fullscreen window without using another space or taking control over the entire monitor. * * On other platforms, this is the same as {@link Window.setFullscreen}.