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

X11: implement with_resizable (#540) (#556)

Browse source
This commit is contained in:
Danny Fritz 2018-06-07 10:46:15 -06:00 • committed by Francesca Frangipane
parent 79aebf06dc
commit 2cc8fa1eac
5 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -422,7 +422,7 @@ pub struct WindowAttributes {
/// The default is `None`.
pub max_dimensions: Option<(u32, u32)>,
/// [Windows only] Whether the window is resizable or not
/// [Windows & X11 only] Whether the window is resizable or not
///
/// The default is `true`.
pub resizable: bool,

11
src/platform/linux/x11/window.rs
View file

@ -216,16 +216,23 @@ impl UnownedWindow {
// set size hints
{
let mut min_dimensions = window_attrs.min_dimensions;
let mut max_dimensions = window_attrs.max_dimensions;
if !window_attrs.resizable {
max_dimensions = Some(dimensions);
min_dimensions = Some(dimensions);
}
let mut size_hints = xconn.alloc_size_hints();
(*size_hints).flags = ffi::PSize;
(*size_hints).width = dimensions.0 as c_int;
(*size_hints).height = dimensions.1 as c_int;
if let Some((min_width, min_height)) = window_attrs.min_dimensions {
if let Some((min_width, min_height)) = min_dimensions {
(*size_hints).flags |= ffi::PMinSize;
(*size_hints).min_width = min_width as c_int;
(*size_hints).min_height = min_height as c_int;
}
if let Some((max_width, max_height)) = window_attrs.max_dimensions {
if let Some((max_width, max_height)) = max_dimensions {
(*size_hints).flags |= ffi::PMaxSize;
(*size_hints).max_width = max_width as c_int;
(*size_hints).max_height = max_height as c_int;

2
src/window.rs
View file

@ -53,7 +53,7 @@ impl WindowBuilder {
///
/// ## Platform-specific
///
/// This only has an effect on Windows.
/// This only has an effect on Windows & X11.
#[inline]
pub fn with_resizable(mut self, resizable: bool) -> WindowBuilder {
self.window.resizable = resizable;