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

fix headless build by ensuring NativeMonitorId enum is available internally even without the window feature; add Eq/PartialEq to NativeMonitorId

Browse source
This commit is contained in:
Ryan Stewart 2015-03-18 14:16:35 -07:00
parent 779f3ce888
commit 1b2fd6e6d0
7 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cocoa/mod.rs
View file

@ -8,7 +8,7 @@ use libc;
use Api;
use BuilderAttribs;
use GlRequest;
use NativeMonitorID;
use native_monitor::NativeMonitorId;
use cocoa::base::{Class, id, YES, NO, NSUInteger, nil, objc_allocateClassPair, class, objc_registerClassPair};
use cocoa::base::{selector, msg_send, msg_send_stret, class_addMethod, class_addIvar};
@ -409,7 +409,7 @@ impl Window {
unsafe {
let screen = monitor.map(|monitor_id| {
let native_id = match monitor_id.get_native_identifier() {
NativeMonitorID::Numeric(num) => num,
NativeMonitorId::Numeric(num) => num,
_ => panic!("OS X monitors should always have a numeric native ID")
};
let matching_screen = {

6
src/cocoa/monitor.rs
View file

@ -1,6 +1,6 @@
use core_graphics::display;
use std::collections::VecDeque;
use window::NativeMonitorID;
use native_monitor::NativeMonitorId;
pub struct MonitorID(u32);
@ -36,9 +36,9 @@ impl MonitorID {
Some(format!("Monitor #{}", screen_num))
}
pub fn get_native_identifier(&self) -> NativeMonitorID {
pub fn get_native_identifier(&self) -> NativeMonitorId {
let MonitorID(display_id) = *self;
NativeMonitorID::Numeric(display_id)
NativeMonitorId::Numeric(display_id)
}
pub fn get_dimensions(&self) -> (u32, u32) {