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

Allow changing resize increments after window creation

Browse source
This commit is contained in:
Anton Bulakh 2022-09-03 21:50:22 +03:00 • committed by GitHub
parent 97d2aaa953
commit ab56e9f57d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 213 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/platform_impl/linux/x11/util/hint.rs
View file

@ -197,11 +197,17 @@ impl<'a> NormalHints<'a> {
}
pub fn get_position(&self) -> Option<(i32, i32)> {
if has_flag(self.size_hints.flags, ffi::PPosition) {
Some((self.size_hints.x as i32, self.size_hints.y as i32))
} else {
None
}
has_flag(self.size_hints.flags, ffi::PPosition)
.then(|| (self.size_hints.x as i32, self.size_hints.y as i32))
}
pub fn get_resize_increments(&self) -> Option<(u32, u32)> {
has_flag(self.size_hints.flags, ffi::PResizeInc).then(|| {
(
self.size_hints.width_inc as u32,
self.size_hints.height_inc as u32,
)
})
}
pub fn set_position(&mut self, position: Option<(i32, i32)>) {

22
src/platform_impl/linux/x11/window.rs
View file

@ -378,7 +378,7 @@ impl UnownedWindow {
let mut shared_state = window.shared_state.get_mut().unwrap();
shared_state.min_inner_size = min_inner_size.map(Into::into);
shared_state.max_inner_size = max_inner_size.map(Into::into);
shared_state.resize_increments = pl_attribs.resize_increments;
shared_state.resize_increments = window_attrs.resize_increments;
shared_state.base_size = pl_attribs.base_size;
let mut normal_hints = util::NormalHints::new(xconn);
@ -387,7 +387,7 @@ impl UnownedWindow {
normal_hints.set_min_size(min_inner_size.map(Into::into));
normal_hints.set_max_size(max_inner_size.map(Into::into));
normal_hints.set_resize_increments(
pl_attribs
window_attrs
.resize_increments
.map(|size| size.to_physical::<u32>(scale_factor).into()),
);
@ -1172,6 +1172,24 @@ impl UnownedWindow {
self.set_max_inner_size_physical(physical_dimensions);
}
#[inline]
pub fn resize_increments(&self) -> Option<PhysicalSize<u32>> {
self.xconn
.get_normal_hints(self.xwindow)
.ok()
.and_then(|hints| hints.get_resize_increments())
.map(Into::into)
}
#[inline]
pub fn set_resize_increments(&self, increments: Option<Size>) {
self.shared_state_lock().resize_increments = increments;
let physical_increments =
increments.map(|increments| increments.to_physical::<u32>(self.scale_factor()).into());
self.update_normal_hints(|hints| hints.set_resize_increments(physical_increments))
.expect("Failed to call `XSetWMNormalHints`");
}
pub(crate) fn adjust_for_dpi(
&self,
old_scale_factor: f64,