Skip to content

[pull] dev from tauri-apps:dev #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Feb 18, 2026
Merged

[pull] dev from tauri-apps:dev #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 1 addition & 77 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions crates/tauri-runtime-wry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ percent-encoding = "2"
objc2 = "0.6"

[target.'cfg(target_os = "macos")'.dependencies]
objc2-foundation = { version = "0.3", features = [] }
objc2-app-kit = { version = "0.3", features = [
objc2-app-kit = { version = "0.3", default-features = false, features = [
"block2",
"NSApplication",
"NSResponder",
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-runtime-wry/src/window/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT

use objc2::MainThreadMarker;
use objc2_app_kit::{NSBackingStoreType, NSWindow, NSWindowStyleMask};
use objc2_foundation::MainThreadMarker;
use tao::platform::macos::WindowExtMacOS;

impl super::WindowExt for tao::window::Window {
Expand Down
6 changes: 5 additions & 1 deletion crates/tauri-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ objc2-ui-kit = { version = "0.3.0", default-features = false, features = [
[target."cfg(target_os = \"macos\")".dependencies]
url = "2"
objc2 = "0.6"
objc2-web-kit = { version = "0.3", features = ["objc2-app-kit", "WKWebView"] }
objc2-web-kit = { version = "0.3", default-features = false, features = [
"objc2-app-kit",
"WKWebView",
"WKWebViewConfiguration",
] }

[features]
devtools = []
Expand Down
3 changes: 2 additions & 1 deletion crates/tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,10 @@ 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", default-features = false, features = [
"objc2-app-kit",
"WKWebView",
"WKWebViewConfiguration",
"WKUserContentController",
] }
window-vibrancy = "0.6"
Expand Down
4 changes: 2 additions & 2 deletions crates/tauri/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2414,9 +2414,9 @@ fn on_event_loop_event<R: Runtime>(
// set the app icon in development
#[cfg(all(dev, target_os = "macos"))]
{
use objc2::AllocAnyThread;
use objc2::{AllocAnyThread, MainThreadMarker};
use objc2_app_kit::{NSApplication, NSImage};
use objc2_foundation::{MainThreadMarker, NSData};
use objc2_foundation::NSData;

if let Some(icon) = app_handle.manager.app_icon.clone() {
// TODO: Enable this check.
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri/src/webview/webview_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ impl<R: Runtime, M: Manager<R>> WebviewWindowBuilder<'_, R, M> {
/// #[cfg(target_os = "ios")]
/// {
/// window_builder = window_builder.with_input_accessory_view_builder(|_webview| unsafe {
/// let mtm = objc2_foundation::MainThreadMarker::new_unchecked();
/// let mtm = objc2::MainThreadMarker::new_unchecked();
/// let button = objc2_ui_kit::UIButton::buttonWithType(objc2_ui_kit::UIButtonType(1), mtm);
/// button.setTitle_forState(
/// Some(&objc2_foundation::NSString::from_str("Tauri")),
Expand Down
Loading