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

Get rid of FullScreenState::get_monitor()

Browse source
This commit is contained in:
Pedro Côrte-Real 2017-08-29 02:08:12 +01:00
parent b3ef9c8b22
commit 60b575a7c1
5 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/platform/macos/window.rs
View file

@ -384,8 +384,8 @@ impl Window {
fn create_window(attrs: &WindowAttributes) -> Option<IdRef> {
unsafe {
let screen = match attrs.fullscreen.get_monitor() {
Some(ref monitor_id) => {
let screen = match attrs.fullscreen {
FullScreenState::Exclusive(ref monitor_id) => {
let native_id = match monitor_id.get_native_identifier() {
NativeMonitorId::Numeric(num) => num,
_ => panic!("OS X monitors should always have a numeric native ID")
@ -411,7 +411,7 @@ impl Window {
};
Some(matching_screen.unwrap_or(appkit::NSScreen::mainScreen(nil)))
},
None => None
_ => None,
};
let frame = match screen {
Some(screen) => appkit::NSScreen::frame(screen),