alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Finish converting windows to the new design

Browse source
This commit is contained in:
Pierre Krieger 2015-09-21 11:11:11 +02:00
parent 932e565391
commit 8f3ec7998d
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/api/win32/mod.rs
View file

@ -13,11 +13,14 @@ use libc;
use ContextError;
use {CreationError, Event, MouseCursor};
use CursorState;
use GlAttributes;
use GlContext;
use Api;
use PixelFormat;
use PixelFormatRequirements;
use BuilderAttribs;
use WindowAttributes;
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
@ -83,15 +86,18 @@ impl WindowProxy {
impl Window {
/// See the docs in the crate root file.
pub fn new(builder: BuilderAttribs, egl: Option<&Egl>) -> Result<Window, CreationError> {
let opengl = builder.opengl.clone().map_sharing(|sharing| {
pub fn new(window: &WindowAttributes, pf_reqs: &PixelFormatRequirements,
opengl: &GlAttributes<&Window>, egl: Option<&Egl>)
-> Result<Window, CreationError>
{
let opengl = opengl.clone().map_sharing(|sharing| {
match sharing.context {
Context::Wgl(ref c) => RawContext::Wgl(c.get_hglrc()),
Context::Egl(_) => unimplemented!(), // FIXME:
}
});
init::new_window(&builder.window, &builder.pf_reqs, &opengl, egl)
init::new_window(window, pf_reqs, &opengl, egl)
}
/// See the docs in the crate root file.

6
src/platform/windows/mod.rs
View file

@ -58,7 +58,8 @@ pub struct Window(win32::Window);
impl Window {
/// See the docs in the crate root file.
pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
win32::Window::new(builder, EGL.as_ref().map(|w| &w.0)).map(|w| Window(w))
win32::Window::new(&builder.window, &builder.pf_reqs, &builder.opengl.clone().map_sharing(|w| &w.0),
EGL.as_ref().map(|w| &w.0)).map(|w| Window(w))
}
}
@ -101,7 +102,8 @@ impl HeadlessContext {
}
}
let window = try!(win32::Window::new(builder, EGL.as_ref().map(|w| &w.0)));
let window = try!(win32::Window::new(&builder.window, &builder.pf_reqs, &builder.opengl.clone().map_sharing(|w| &w.0),
EGL.as_ref().map(|w| &w.0)));
Ok(HeadlessContext::HiddenWindow(window))
}
}