tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-12-01 11:13:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps) Update Tauri Core (#2946)

Browse Source 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
This commit is contained in:
renovate[bot] 2021-11-24 11:12:26 -03:00 committed by GitHub
parent f813a25da8
commit ec8540d65b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/tauri-runtime-wry/src/lib.rs
View File

@ -378,6 +378,7 @@ impl From<NativeImage> for NativeImageWrapper {
#[derive(Debug, Clone)]
pub struct GlobalShortcutWrapper(GlobalShortcut);
#[allow(clippy::non_send_fields_in_send_ty)]
unsafe impl Send for GlobalShortcutWrapper {}
/// Wrapper around [`WryShortcutManager`].
@ -698,6 +699,7 @@ pub struct WindowBuilderWrapper {
}
// safe since `menu_items` are read only here
#[allow(clippy::non_send_fields_in_send_ty)]
unsafe impl Send for WindowBuilderWrapper {}
impl WindowBuilderBase for WindowBuilderWrapper {}

6
core/tauri/Cargo.toml
View File

@ -67,10 +67,10 @@ attohttpc = { version = "0.18", features = [ "json", "form" ] }
open = { version = "2.0", optional = true }
shared_child = { version = "1.0", optional = true }
os_pipe = { version = "1.0", optional = true }
rfd = { version = "0.5.1", features = [ "parent" ] }
raw-window-handle = "0.3.3"
rfd = { version = "0.6.1", features = [ "parent" ] }
raw-window-handle = "0.4.1"
minisign-verify = { version = "0.2", optional = true }
os_info = { version = "3.0.7", optional = true }
os_info = { version = "3.0.8", optional = true }
futures-lite = "1.12"
[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]

8
core/tauri/src/window.rs
View File

@ -102,18 +102,18 @@ pub struct Window<R: Runtime> {
unsafe impl<R: Runtime> raw_window_handle::HasRawWindowHandle for Window<R> {
#[cfg(windows)]
fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle {
let mut handle = raw_window_handle::windows::WindowsHandle::empty();
let mut handle = raw_window_handle::Win32Handle::empty();
handle.hwnd = self.hwnd().expect("failed to get window `hwnd`");
raw_window_handle::RawWindowHandle::Windows(handle)
raw_window_handle::RawWindowHandle::Win32(handle)
}
#[cfg(target_os = "macos")]
fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle {
let mut handle = raw_window_handle::macos::MacOSHandle::empty();
let mut handle = raw_window_handle::AppKitHandle::empty();
handle.ns_window = self
.ns_window()
.expect("failed to get window's `ns_window`");
raw_window_handle::RawWindowHandle::MacOS(handle)
raw_window_handle::RawWindowHandle::AppKit(handle)
}
}