alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-17 15:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup some previous merge errors

Browse source
This commit is contained in:
Victor Berger 2019-04-07 15:58:47 +02:00
parent 3cd40ef655
commit f7d7acb3c5
5 changed files with 2 additions and 1298 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1258
src/platform/windows/events_loop.rs
View file

File diff suppressed because it is too large Load diff

38
src/platform_impl/macos/util.rs
View file

@ -1,38 +0,0 @@
use cocoa::appkit::NSWindowStyleMask;
use cocoa::base::{id, nil};
use cocoa::foundation::{NSRect, NSUInteger};
use core_graphics::display::CGDisplay;
use platform_impl::platform::ffi;
use platform_impl::platform::window::IdRef;
pub const EMPTY_RANGE: ffi::NSRange = ffi::NSRange {
location: ffi::NSNotFound as NSUInteger,
length: 0,
};
// For consistency with other platforms, this will...
// 1. translate the bottom-left window corner into the top-left window corner
// 2. translate the coordinate from a bottom-left origin coordinate system to a top-left one
pub fn bottom_left_to_top_left(rect: NSRect) -> f64 {
CGDisplay::main().pixels_high() as f64 - (rect.origin.y + rect.size.height)
}
pub unsafe fn set_style_mask(window: id, view: id, mask: NSWindowStyleMask) {
use cocoa::appkit::NSWindow;
window.setStyleMask_(mask);
// If we don't do this, key handling will break. Therefore, never call `setStyleMask` directly!
window.makeFirstResponder_(view);
}
pub unsafe fn create_input_context(view: id) -> IdRef {
let input_context: id = msg_send![class!(NSTextInputContext), alloc];
let input_context: id = msg_send![input_context, initWithClient:view];
IdRef::new(input_context)
}
#[allow(dead_code)]
pub unsafe fn open_emoji_picker() {
let app: id = msg_send![class!(NSApplication), sharedApplication];
let _: () = msg_send![app, orderFrontCharacterPalette:nil];
}

0
src/platform/macos/util/cursor.rs → src/platform_impl/macos/util/cursor.rs
View file

0
src/platform/macos/util/into_option.rs → src/platform_impl/macos/util/into_option.rs
View file

4
src/platform/macos/util/mod.rs → src/platform_impl/macos/util/mod.rs
View file

@ -9,8 +9,8 @@ use cocoa::foundation::{NSRect, NSUInteger};
use core_graphics::display::CGDisplay;
use objc::runtime::{Class, Object};
use platform::platform::ffi;
use platform::platform::window::IdRef;
use platform_impl::platform::ffi;
use platform_impl::platform::window::IdRef;
pub const EMPTY_RANGE: ffi::NSRange = ffi::NSRange {
location: ffi::NSNotFound as NSUInteger,