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

16
src/window.rs
View file

@ -7,6 +7,7 @@ use CreationError;
use Event;
use GlRequest;
use MouseCursor;
use native_monitor::NativeMonitorId;
use gl_common;
use libc;
@ -500,19 +501,6 @@ pub fn get_primary_monitor() -> MonitorID {
MonitorID(winimpl::get_primary_monitor())
}
/// Native platform identifier for a monitor. Different platforms use fundamentally different types
/// to represent a monitor ID.
pub enum NativeMonitorID {
/// Cocoa and X11 use a numeric identifier to represent a monitor.
Numeric(u32),
/// Win32 uses a Unicode string to represent a monitor.
Name(String),
/// Other platforms (Android) don't support monitor identification.
Unavailable
}
/// Identifier for a monitor.
pub struct MonitorID(winimpl::MonitorID);
@ -524,7 +512,7 @@ impl MonitorID {
}
/// Returns the native platform identifier for this monitor.
pub fn get_native_identifier(&self) -> NativeMonitorID {
pub fn get_native_identifier(&self) -> NativeMonitorId {
let &MonitorID(ref id) = self;
id.get_native_identifier()
}