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

Update objc2 version (#2936)

Browse Source 
* Upgrade to objc2 v0.4.0 and icrate v0.0.3

* Fix `touchBar` method

* Use ClassType::alloc

* Use #[method_id(...)] functionality in declare_class!
This commit is contained in:
Mads Marquart
2023-07-29 00:33:03 +02:00
committed by Kirill Chibisov
parent 3925281652
commit 645b1ff00f
53 changed files with 815 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/platform_impl/macos/appkit/screen.rs
View File

@@ -1,7 +1,8 @@
use objc2::foundation::{CGFloat, NSArray, NSDictionary, NSNumber, NSObject, NSRect, NSString};
use objc2::rc::{Id, Shared};
use icrate::ns_string;
use icrate::Foundation::{CGFloat, NSArray, NSDictionary, NSNumber, NSObject, NSRect, NSString};
use objc2::rc::Id;
use objc2::runtime::Object;
use objc2::{extern_class, extern_methods, msg_send_id, ns_string, ClassType};
use objc2::{extern_class, extern_methods, mutability, ClassType};
extern_class!(
#[derive(Debug, PartialEq, Eq, Hash)]
@@ -9,6 +10,7 @@ extern_class!(
unsafe impl ClassType for NSScreen {
type Super = NSObject;
type Mutability = mutability::InteriorMutable;
}
);
@@ -17,26 +19,21 @@ extern_class!(
extern_methods!(
unsafe impl NSScreen {
/// The application object must have been created.
pub fn main() -> Option<Id<Self, Shared>> {
unsafe { msg_send_id![Self::class(), mainScreen] }
}
#[method_id(mainScreen)]
pub fn main() -> Option<Id<Self>>;
/// The application object must have been created.
pub fn screens() -> Id<NSArray<Self, Shared>, Shared> {
unsafe { msg_send_id![Self::class(), screens] }
}
#[method_id(screens)]
pub fn screens() -> Id<NSArray<Self>>;
#[sel(frame)]
#[method(frame)]
pub fn frame(&self) -> NSRect;
#[sel(visibleFrame)]
#[method(visibleFrame)]
pub fn visibleFrame(&self) -> NSRect;
pub fn deviceDescription(
&self,
) -> Id<NSDictionary<NSDeviceDescriptionKey, Object>, Shared> {
unsafe { msg_send_id![self, deviceDescription] }
}
#[method_id(deviceDescription)]
pub fn deviceDescription(&self) -> Id<NSDictionary<NSDeviceDescriptionKey, Object>>;
pub fn display_id(&self) -> u32 {
let key = ns_string!("NSScreenNumber");
@@ -60,7 +57,7 @@ extern_methods!(
})
}
#[sel(backingScaleFactor)]
#[method(backingScaleFactor)]
pub fn backingScaleFactor(&self) -> CGFloat;
}
);