migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 12:50:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor macOS to use new objc2 features (#2465)

Browse Source 
* Remove UnownedWindow::inner_rect

* Refactor custom view to use much less `unsafe`

The compiler fence is safe to get rid of now since `interpretKeyEvents` takes `&mut self`

* Refactor Window to use much less unsafe

* Refactor NSApplication usage to have much less unsafe

* Remove cocoa dependency

* Enable `deny(unsafe_op_in_unsafe_fn)` on macOS

Also re-enable clippy `let_unit_value` lint

* Remove #[macro_use] on macOS

* Refactor window delegate to use much less unsafe
This commit is contained in:
Mads Marquart
2022-09-08 16:45:29 +02:00
committed by GitHub
parent 05dd31b8ea
commit 340f951d10
34 changed files with 2756 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/platform/macos.rs
View File

@@ -1,3 +1,4 @@
use objc2::rc::Id;
use std::os::raw::c_void;
use crate::{
@@ -240,7 +241,7 @@ impl MonitorHandleExtMacOS for MonitorHandle {
}
fn ns_screen(&self) -> Option<*mut c_void> {
self.inner.ns_screen().map(|s| s as *mut c_void)
self.inner.ns_screen().map(|s| Id::as_ptr(&s) as _)
}
}