migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-28 07:33:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

macOS: fix panic during drag_window

Browse Source 
Return error from it instead of unwrapping.
This commit is contained in:
Shane Celis
2024-10-22 07:00:53 -04:00
committed by GitHub
parent fb6b1d487b
commit a5f5ce6a3d
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/platform_impl/apple/appkit/window.rs
View File

@@ -284,8 +284,7 @@ impl CoreWindow for Window {
}
fn drag_window(&self) -> Result<(), RequestError> {
self.maybe_wait_on_main(|delegate| delegate.drag_window());
Ok(())
self.maybe_wait_on_main(|delegate| delegate.drag_window())
}
fn drag_resize_window(

6
src/platform_impl/apple/appkit/window_delegate.rs
View File

@@ -1171,10 +1171,12 @@ impl WindowDelegate {
}
#[inline]
pub fn drag_window(&self) {
pub fn drag_window(&self) -> Result<(), RequestError> {
let mtm = MainThreadMarker::from(self);
let event = NSApplication::sharedApplication(mtm).currentEvent().unwrap();
let event =
NSApplication::sharedApplication(mtm).currentEvent().ok_or(RequestError::Ignored)?;
self.window().performWindowDragWithEvent(&event);
Ok(())
}
#[inline]