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

Rename MonitorID -> MonitorId

Browse source
This commit is contained in:
Pierre Krieger 2015-09-24 09:11:59 +02:00
parent aa5f5de109
commit 86fa1b58e5
19 changed files with 106 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/x11/window.rs
View file

@ -23,11 +23,11 @@ use api::glx::Context as GlxContext;
use api::egl;
use api::egl::Context as EglContext;
use platform::MonitorID as PlatformMonitorID;
use platform::MonitorId as PlatformMonitorId;
use super::input::XInputEventHandler;
use super::{ffi};
use super::{MonitorID, XConnection};
use super::{MonitorId, XConnection};
// XOpenIM doesn't seem to be thread-safe
lazy_static! { // TODO: use a static mutex when that's possible, and put me back in my function
@ -305,7 +305,7 @@ impl Window {
let dimensions = window_attrs.dimensions.unwrap_or((800, 600));
let screen_id = match window_attrs.monitor {
Some(PlatformMonitorID::X(MonitorID(_, monitor))) => monitor as i32,
Some(PlatformMonitorId::X(MonitorId(_, monitor))) => monitor as i32,
_ => unsafe { (display.xlib.XDefaultScreen)(display.display) },
};