mirror of
https://github.com/rust-windowing/winit.git
synced 2026-08-30 05:10:03 -04:00
Merge branch 'master' of http://github.com/tomaka/gl-init-rs
This commit is contained in:
@@ -17,7 +17,7 @@ local_data_key!(WINDOW: (ffi::HWND, Sender<Event>))
|
||||
pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: String,
|
||||
builder_monitor: Option<super::MonitorID>,
|
||||
builder_gl_version: Option<(uint, uint)>, builder_vsync: bool,
|
||||
builder_headless: bool) -> Result<Window, String>
|
||||
builder_hidden: bool) -> Result<Window, String>
|
||||
{
|
||||
use std::mem;
|
||||
use std::os;
|
||||
@@ -237,7 +237,7 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
|
||||
(None, None)
|
||||
};
|
||||
|
||||
let style = if builder_headless {
|
||||
let style = if builder_hidden {
|
||||
style
|
||||
} else {
|
||||
style | ffi::WS_VISIBLE
|
||||
|
||||
@@ -68,8 +68,8 @@ pub struct Window {
|
||||
impl Window {
|
||||
/// See the docs in the crate root file.
|
||||
pub fn new(builder: WindowBuilder) -> Result<Window, String> {
|
||||
let WindowBuilder { dimensions, title, monitor, gl_version, vsync } = builder;
|
||||
init::new_window(dimensions, title, monitor, gl_version, vsync, false)
|
||||
let WindowBuilder { dimensions, title, monitor, gl_version, vsync, visible } = builder;
|
||||
init::new_window(dimensions, title, monitor, gl_version, vsync, !visible)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,6 +91,18 @@ impl Window {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn show(&self) {
|
||||
unsafe {
|
||||
ffi::ShowWindow(self.window, ffi::SW_SHOW);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn hide(&self) {
|
||||
unsafe {
|
||||
ffi::ShowWindow(self.window, ffi::SW_HIDE);
|
||||
}
|
||||
}
|
||||
|
||||
/// See the docs in the crate root file.
|
||||
pub fn get_position(&self) -> Option<(int, int)> {
|
||||
use std::mem;
|
||||
|
||||
Reference in New Issue
Block a user