From 7a499ce9ffeb06eaea3a9fd83530f822bed2f38a Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Wed, 5 Aug 2026 14:38:41 +0800 Subject: [PATCH] fix(macos): remove vendored wry deprecation warnings --- vendor/wry/Cargo.toml | 1 + vendor/wry/DBX-PATCH.md | 5 +++ .../wkwebview/class/wry_web_view_parent.rs | 6 +-- .../class/wry_web_view_ui_delegate.rs | 4 +- vendor/wry/src/wkwebview/drag_drop.rs | 37 ++++++++++--------- vendor/wry/src/wkwebview/mod.rs | 2 +- .../src/wkwebview/synthetic_mouse_events.rs | 13 +++---- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/vendor/wry/Cargo.toml b/vendor/wry/Cargo.toml index 0988872b01..c5178d95e7 100644 --- a/vendor/wry/Cargo.toml +++ b/vendor/wry/Cargo.toml @@ -291,6 +291,7 @@ features = [ "NSWindow", "NSView", "NSPasteboard", + "NSPasteboardItem", "NSPanel", "NSResponder", "NSOpenPanel", diff --git a/vendor/wry/DBX-PATCH.md b/vendor/wry/DBX-PATCH.md index 634b467552..b462cc0851 100644 --- a/vendor/wry/DBX-PATCH.md +++ b/vendor/wry/DBX-PATCH.md @@ -7,3 +7,8 @@ Upstream Wry passes a null browser folder to these APIs. That works with the Evergreen Runtime but prevents DBX's Windows 7 build from reliably selecting its bundled WebView2 109 Fixed Runtime. Other Windows targets retain the upstream null-folder behavior. + +On macOS, DBX also updates Wry's pasteboard and modifier-key APIs for +`objc2-app-kit` 0.3.2 and removes `unsafe` blocks around methods that are now +exposed as safe. This keeps file drag-and-drop behavior while avoiding +deprecated AppKit constants and compiler warnings. diff --git a/vendor/wry/src/wkwebview/class/wry_web_view_parent.rs b/vendor/wry/src/wkwebview/class/wry_web_view_parent.rs index 2d7d8158d9..1fd6c3234c 100644 --- a/vendor/wry/src/wkwebview/class/wry_web_view_parent.rs +++ b/vendor/wry/src/wkwebview/class/wry_web_view_parent.rs @@ -30,10 +30,8 @@ define_class!( fn key_down(&self, event: &NSEvent) { let mtm = MainThreadMarker::new().unwrap(); let app = NSApplication::sharedApplication(mtm); - unsafe { - if let Some(menu) = app.mainMenu() { - menu.performKeyEquivalent(event); - } + if let Some(menu) = app.mainMenu() { + menu.performKeyEquivalent(event); } } diff --git a/vendor/wry/src/wkwebview/class/wry_web_view_ui_delegate.rs b/vendor/wry/src/wkwebview/class/wry_web_view_ui_delegate.rs index 9b21cc0d76..184245bbf4 100644 --- a/vendor/wry/src/wkwebview/class/wry_web_view_ui_delegate.rs +++ b/vendor/wry/src/wkwebview/class/wry_web_view_ui_delegate.rs @@ -40,9 +40,7 @@ unsafe impl Send for NewWindow {} #[cfg(target_os = "macos")] impl Drop for NewWindow { fn drop(&mut self) { - unsafe { - self.webview.removeFromSuperview(); - } + self.webview.removeFromSuperview(); } } diff --git a/vendor/wry/src/wkwebview/drag_drop.rs b/vendor/wry/src/wkwebview/drag_drop.rs index e28364e4a0..ef594fea9d 100644 --- a/vendor/wry/src/wkwebview/drag_drop.rs +++ b/vendor/wry/src/wkwebview/drag_drop.rs @@ -2,31 +2,34 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT -use std::{ffi::CStr, path::PathBuf}; +use std::path::PathBuf; use objc2::{ runtime::{Bool, ProtocolObject}, DeclaredClass, }; -use objc2_app_kit::{NSDragOperation, NSDraggingInfo, NSFilenamesPboardType}; -use objc2_foundation::{NSArray, NSPoint, NSRect, NSString}; +use objc2_app_kit::{NSDragOperation, NSDraggingInfo, NSPasteboardTypeFileURL}; +use objc2_foundation::{NSPoint, NSRect, NSURL}; use crate::DragDropEvent; use super::WryWebView; -pub(crate) unsafe fn collect_paths(drag_info: &ProtocolObject) -> Vec { +pub(crate) fn collect_paths(drag_info: &ProtocolObject) -> Vec { let pb = drag_info.draggingPasteboard(); let mut drag_drop_paths = Vec::new(); - let types = NSArray::arrayWithObject(NSFilenamesPboardType); - if pb.availableTypeFromArray(&types).is_some() { - let paths = pb.propertyListForType(NSFilenamesPboardType).unwrap(); - let paths = paths.downcast::().unwrap(); - for path in paths { - let path = path.downcast::().unwrap(); - let path = CStr::from_ptr(path.UTF8String()).to_string_lossy(); - drag_drop_paths.push(PathBuf::from(path.into_owned())); + if let Some(items) = pb.pasteboardItems() { + for item in items.iter() { + let Some(url_string) = item.stringForType(unsafe { NSPasteboardTypeFileURL }) else { + continue; + }; + let Some(url) = NSURL::URLWithString(&url_string) else { + continue; + }; + if let Some(path) = url.path() { + drag_drop_paths.push(PathBuf::from(path.to_string())); + } } } drag_drop_paths @@ -36,8 +39,8 @@ pub(crate) fn dragging_entered( this: &WryWebView, drag_info: &ProtocolObject, ) -> NSDragOperation { - let paths = unsafe { collect_paths(drag_info) }; - let dl: NSPoint = unsafe { drag_info.draggingLocation() }; + let paths = collect_paths(drag_info); + let dl: NSPoint = drag_info.draggingLocation(); let frame: NSRect = this.frame(); let position = (dl.x as i32, (frame.size.height - dl.y) as i32); @@ -54,7 +57,7 @@ pub(crate) fn dragging_updated( this: &WryWebView, drag_info: &ProtocolObject, ) -> NSDragOperation { - let dl: NSPoint = unsafe { drag_info.draggingLocation() }; + let dl: NSPoint = drag_info.draggingLocation(); let frame: NSRect = this.frame(); let position = (dl.x as i32, (frame.size.height - dl.y) as i32); @@ -81,8 +84,8 @@ pub(crate) fn perform_drag_operation( this: &WryWebView, drag_info: &ProtocolObject, ) -> Bool { - let paths = unsafe { collect_paths(drag_info) }; - let dl: NSPoint = unsafe { drag_info.draggingLocation() }; + let paths = collect_paths(drag_info); + let dl: NSPoint = drag_info.draggingLocation(); let frame: NSRect = this.frame(); let position = (dl.x as i32, (frame.size.height - dl.y) as i32); diff --git a/vendor/wry/src/wkwebview/mod.rs b/vendor/wry/src/wkwebview/mod.rs index 6856349802..08b29e9ccc 100644 --- a/vendor/wry/src/wkwebview/mod.rs +++ b/vendor/wry/src/wkwebview/mod.rs @@ -1347,7 +1347,7 @@ r#"Object.defineProperty(window, 'ipc', { pub fn url_from_webview(webview: &WKWebView) -> Result { let url_obj = unsafe { webview.URL().unwrap() }; - let absolute_url = unsafe { url_obj.absoluteString().unwrap() }; + let absolute_url = url_obj.absoluteString().unwrap(); let bytes = { let bytes: *const c_char = absolute_url.UTF8String(); diff --git a/vendor/wry/src/wkwebview/synthetic_mouse_events.rs b/vendor/wry/src/wkwebview/synthetic_mouse_events.rs index 97c4273136..9ae86b519f 100644 --- a/vendor/wry/src/wkwebview/synthetic_mouse_events.rs +++ b/vendor/wry/src/wkwebview/synthetic_mouse_events.rs @@ -1,7 +1,4 @@ -use objc2_app_kit::{ - NSAlternateKeyMask, NSCommandKeyMask, NSControlKeyMask, NSEvent, NSEventType, NSShiftKeyMask, - NSView, -}; +use objc2_app_kit::{NSEvent, NSEventModifierFlags, NSEventType, NSView}; use objc2_foundation::NSString; use super::WryWebView; @@ -113,10 +110,10 @@ unsafe fn create_js_mouse_event( x = x, y = y, detail = event.clickCount(), - ctrl_key = mods_flags.contains(NSControlKeyMask), - alt_key = mods_flags.contains(NSAlternateKeyMask), - shift_key = mods_flags.contains(NSShiftKeyMask), - meta_key = mods_flags.contains(NSCommandKeyMask), + ctrl_key = mods_flags.contains(NSEventModifierFlags::Control), + alt_key = mods_flags.contains(NSEventModifierFlags::Option), + shift_key = mods_flags.contains(NSEventModifierFlags::Shift), + meta_key = mods_flags.contains(NSEventModifierFlags::Command), button = button, buttons = buttons, )