Add visibility-related functions to window

This commit is contained in:
Tomaka17 2014-11-01 09:02:01 +01:00
parent a479b2f60c
commit b6f7491157
6 changed files with 64 additions and 4 deletions

View file

@ -125,6 +125,12 @@ impl Window {
pub fn set_title(&self, _: &str) { pub fn set_title(&self, _: &str) {
} }
pub fn show(&self) {
}
pub fn hide(&self) {
}
pub fn get_position(&self) -> Option<(int, int)> { pub fn get_position(&self) -> Option<(int, int)> {
None None
} }

View file

@ -74,6 +74,7 @@ pub struct WindowBuilder {
monitor: Option<winimpl::MonitorID>, monitor: Option<winimpl::MonitorID>,
gl_version: Option<(uint, uint)>, gl_version: Option<(uint, uint)>,
vsync: bool, vsync: bool,
visible: bool,
} }
#[cfg(feature = "window")] #[cfg(feature = "window")]
@ -86,6 +87,7 @@ impl WindowBuilder {
monitor: None, monitor: None,
gl_version: None, gl_version: None,
vsync: false, vsync: false,
visible: true,
} }
} }
@ -127,6 +129,12 @@ impl WindowBuilder {
self self
} }
/// Sets whether the window will be initially hidden or visible.
pub fn with_visibility(mut self, visible: bool) -> WindowBuilder {
self.visible = visible;
self
}
/// Builds the window. /// Builds the window.
/// ///
/// Error should be very rare and only occur in case of permission denied, incompatible system, /// Error should be very rare and only occur in case of permission denied, incompatible system,
@ -252,6 +260,28 @@ impl Window {
self.window.set_title(title) self.window.set_title(title)
} }
/// Shows the window if it was hidden.
///
/// ## Platform-specific
///
/// - Has no effect on Android
///
#[inline]
pub fn show(&self) {
self.window.show()
}
/// Hides the window if it was visible.
///
/// ## Platform-specific
///
/// - Has no effect on Android
///
#[inline]
pub fn hide(&self) {
self.window.hide()
}
/// Returns the position of the top-left hand corner of the window relative to the /// Returns the position of the top-left hand corner of the window relative to the
/// top-left hand corner of the desktop. /// top-left hand corner of the desktop.
/// ///

View file

@ -198,6 +198,12 @@ impl Window {
unimplemented!() unimplemented!()
} }
pub fn show(&self) {
}
pub fn hide(&self) {
}
pub fn get_position(&self) -> Option<(int, int)> { pub fn get_position(&self) -> Option<(int, int)> {
unimplemented!() unimplemented!()
} }

View file

@ -17,7 +17,7 @@ local_data_key!(WINDOW: (ffi::HWND, Sender<Event>))
pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: String, pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: String,
builder_monitor: Option<super::MonitorID>, builder_monitor: Option<super::MonitorID>,
builder_gl_version: Option<(uint, uint)>, builder_vsync: bool, 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::mem;
use std::os; use std::os;
@ -237,7 +237,7 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
(None, None) (None, None)
}; };
let style = if builder_headless { let style = if builder_hidden {
style style
} else { } else {
style | ffi::WS_VISIBLE style | ffi::WS_VISIBLE

View file

@ -68,8 +68,8 @@ pub struct Window {
impl Window { impl Window {
/// See the docs in the crate root file. /// See the docs in the crate root file.
pub fn new(builder: WindowBuilder) -> Result<Window, String> { pub fn new(builder: WindowBuilder) -> Result<Window, String> {
let WindowBuilder { dimensions, title, monitor, gl_version, vsync } = builder; let WindowBuilder { dimensions, title, monitor, gl_version, vsync, visible } = builder;
init::new_window(dimensions, title, monitor, gl_version, vsync, false) 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. /// See the docs in the crate root file.
pub fn get_position(&self) -> Option<(int, int)> { pub fn get_position(&self) -> Option<(int, int)> {
use std::mem; use std::mem;

View file

@ -295,6 +295,12 @@ impl Window {
} }
} }
pub fn show(&self) {
}
pub fn hide(&self) {
}
fn get_geometry(&self) -> Option<(int, int, uint, uint)> { fn get_geometry(&self) -> Option<(int, int, uint, uint)> {
unsafe { unsafe {
use std::mem; use std::mem;