migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-01 06:10:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

On Wayland, fix min/max inner size setting

Browse Source 
The size is only applied on the next `wl_surface::commit` thus we
must trigger the redraw.
This commit is contained in:
Kirill Chibisov
2024-02-01 00:11:31 +04:00
parent c9030f06c0
commit 3de08204d3
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -18,6 +18,7 @@ Unreleased` header.
- On X11, reload dpi on `_XSETTINGS_SETTINGS` update. - On X11, reload dpi on `_XSETTINGS_SETTINGS` update.
- On X11, fix deadlock when adjusting DPI and resizing at the same time. - On X11, fix deadlock when adjusting DPI and resizing at the same time.
- On Wayland, fix `Focused(false)` being send when other seats still have window focused. - On Wayland, fix `Focused(false)` being send when other seats still have window focused.
- On Wayland, fix `Window::set_{min,max}_inner_size` not always applied.
# 0.29.10 # 0.29.10

13
src/platform_impl/linux/wayland/window/mod.rs
View File

@@ -327,7 +327,9 @@ impl Window {
self.window_state self.window_state
.lock() .lock()
.unwrap() .unwrap()
.set_min_inner_size(min_size) .set_min_inner_size(min_size);
// NOTE: Requires commit to be applied.
self.request_redraw();
} }
/// Set the maximum inner size for the window. /// Set the maximum inner size for the window.
@@ -338,7 +340,9 @@ impl Window {
self.window_state self.window_state
.lock() .lock()
.unwrap() .unwrap()
.set_max_inner_size(max_size) .set_max_inner_size(max_size);
// NOTE: Requires commit to be applied.
self.request_redraw();
} }
#[inline] #[inline]
@@ -387,7 +391,10 @@ impl Window {
#[inline] #[inline]
pub fn set_resizable(&self, resizable: bool) { pub fn set_resizable(&self, resizable: bool) {
self.window_state.lock().unwrap().set_resizable(resizable); if self.window_state.lock().unwrap().set_resizable(resizable) {
// NOTE: Requires commit to be applied.
self.request_redraw();
}
} }
#[inline] #[inline]

8
src/platform_impl/linux/wayland/window/state.rs
View File

@@ -498,10 +498,12 @@ impl WindowState {
} }
/// Set the resizable state on the window. /// Set the resizable state on the window.
///
/// Returns `true` when the state was applied.
#[inline] #[inline]
pub fn set_resizable(&mut self, resizable: bool) { pub fn set_resizable(&mut self, resizable: bool) -> bool {
if self.resizable == resizable { if self.resizable == resizable {
return; return false;
} }
self.resizable = resizable; self.resizable = resizable;
@@ -517,6 +519,8 @@ impl WindowState {
if let Some(frame) = self.frame.as_mut() { if let Some(frame) = self.frame.as_mut() {
frame.set_resizable(resizable); frame.set_resizable(resizable);
} }
true
} }
/// Whether the window is focused by any seat. /// Whether the window is focused by any seat.