leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update icrate to v0.0.4 (#2992)

Browse source
This commit is contained in:
Mads Marquart 2023-08-02 16:30:41 +02:00 • committed by GitHub
parent 19e3906369
commit b5aa96bea4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/platform_impl/ios/app_state.rs
View file

@ -18,7 +18,7 @@ use core_foundation::runloop::{
};
use icrate::Foundation::{CGRect, CGSize, NSInteger, NSProcessInfo};
use objc2::rc::Id;
use objc2::runtime::Object;
use objc2::runtime::AnyObject;
use objc2::{msg_send, sel};
use once_cell::sync::Lazy;
@ -538,7 +538,7 @@ pub unsafe fn did_finish_launching() {
// completed. This may result in incorrect visual appearance.
// ```
let screen = window.screen();
let _: () = msg_send![&window, setScreen: ptr::null::<Object>()];
let _: () = msg_send![&window, setScreen: ptr::null::<AnyObject>()];
window.setScreen(&screen);
let controller = window.rootViewController();

4
src/platform_impl/ios/view.rs
View file

@ -5,7 +5,7 @@ use std::ptr::NonNull;
use icrate::Foundation::{CGFloat, CGRect, MainThreadMarker, NSObject, NSObjectProtocol, NSSet};
use objc2::declare::{Ivar, IvarDrop};
use objc2::rc::Id;
use objc2::runtime::Class;
use objc2::runtime::AnyClass;
use objc2::{declare_class, extern_methods, msg_send, msg_send_id, mutability, ClassType};
use super::uikit::{
@ -167,7 +167,7 @@ extern_methods!(
// TODO: Allow the user to customize this
#[method(layerClass)]
pub(crate) fn layerClass() -> &'static Class;
pub(crate) fn layerClass() -> &'static AnyClass;
}
);

6
src/platform_impl/ios/window.rs
View file

@ -8,7 +8,7 @@ use std::{
use icrate::Foundation::{CGFloat, CGPoint, CGRect, CGSize, MainThreadMarker};
use objc2::rc::Id;
use objc2::runtime::Object;
use objc2::runtime::AnyObject;
use objc2::{class, msg_send};
use raw_window_handle::{RawDisplayHandle, RawWindowHandle, UiKitDisplayHandle, UiKitWindowHandle};
@ -646,8 +646,8 @@ impl From<u64> for WindowId {
unsafe impl Send for WindowId {}
unsafe impl Sync for WindowId {}
impl From<&Object> for WindowId {
fn from(window: &Object) -> WindowId {
impl From<&AnyObject> for WindowId {
fn from(window: &AnyObject) -> WindowId {
WindowId {
window: window as *const _ as _,
}