Merge pull request #545 from bvssvni/inner-split

Split `get_inner_size`
This commit is contained in:
tomaka 2015-07-25 14:09:17 +02:00
commit f6b7088011

View file

@ -300,11 +300,40 @@ impl Window {
/// To get the dimensions of the frame buffer when calling `glViewport`, multiply with hidpi factor. /// To get the dimensions of the frame buffer when calling `glViewport`, multiply with hidpi factor.
/// ///
/// Returns `None` if the window no longer exists. /// Returns `None` if the window no longer exists.
///
/// DEPRECATED
#[inline] #[inline]
pub fn get_inner_size(&self) -> Option<(u32, u32)> { pub fn get_inner_size(&self) -> Option<(u32, u32)> {
self.window.get_inner_size() self.window.get_inner_size()
} }
/// Returns the size in points of the client area of the window.
///
/// The client area is the content of the window, excluding the title bar and borders.
/// To get the dimensions of the frame buffer when calling `glViewport`, multiply with hidpi factor.
///
/// Returns `None` if the window no longer exists.
#[inline]
pub fn get_inner_size_points(&self) -> Option<(u32, u32)> {
self.window.get_inner_size()
}
/// Returns the size in pixels of the client area of the window.
///
/// The client area is the content of the window, excluding the title bar and borders.
/// These are the dimensions of the frame buffer, and the dimensions that you should use
/// when you call `glViewport`.
///
/// Returns `None` if the window no longer exists.
#[inline]
pub fn get_inner_size_pixels(&self) -> Option<(u32, u32)> {
self.window.get_inner_size().map(|(x, y)| {
let hidpi = self.hidpi_factor();
((x as f32 * hidpi) as u32, (y as f32 * hidpi) as u32)
})
}
/// Returns the size in pixels of the window. /// Returns the size in pixels of the window.
/// ///
/// These dimensions include title bar and borders. If you don't want these, you should use /// These dimensions include title bar and borders. If you don't want these, you should use