leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: skip resize if size is unchanged

Browse source
This commit is contained in:
Ashley Wulber 2025-10-23 17:06:53 -04:00
parent 70b9736dc7
commit fd2220775b
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
winit/src/platform_specific/wayland/event_loop/state.rs
View file

@ -273,6 +273,11 @@ pub struct SctkPopup {
impl SctkPopup { impl SctkPopup {
pub(crate) fn set_size(&mut self, w: u32, h: u32, token: u32) { pub(crate) fn set_size(&mut self, w: u32, h: u32, token: u32) {
let guard = self.common.lock().unwrap();
if guard.size.width == w && guard.size.height == h {
return;
}
drop(guard);
// update geometry // update geometry
self.popup self.popup
.xdg_surface() .xdg_surface()
@ -285,6 +290,9 @@ impl SctkPopup {
pub(crate) fn update_viewport(&mut self, w: u32, h: u32) { pub(crate) fn update_viewport(&mut self, w: u32, h: u32) {
let common = self.common.lock().unwrap(); let common = self.common.lock().unwrap();
if common.size.width == w && common.size.height == h {
return;
}
if let Some(viewport) = common.wp_viewport.as_ref() { if let Some(viewport) = common.wp_viewport.as_ref() {
// Set inner size without the borders. // Set inner size without the borders.
viewport.set_destination(w as i32, h as i32); viewport.set_destination(w as i32, h as i32);

17
winit/src/platform_specific/wayland/winit_window.rs
View file

@ -110,6 +110,12 @@ impl winit::window::Window for SctkWinitWindow {
if logical_size.width == 0 || logical_size.height == 0 { if logical_size.width == 0 || logical_size.height == 0 {
return None; return None;
} }
if guard.size.width == logical_size.width
&& guard.size.height == logical_size.height
{
return None;
}
guard.size = logical_size; guard.size = logical_size;
guard.requested_size.0 = Some(guard.size.width); guard.requested_size.0 = Some(guard.size.width);
guard.requested_size.1 = Some(guard.size.height); guard.requested_size.1 = Some(guard.size.height);
@ -147,6 +153,12 @@ impl winit::window::Window for SctkWinitWindow {
if logical_size.height > 0 { if logical_size.height > 0 {
guard.size.height = logical_size.height; guard.size.height = logical_size.height;
} }
if guard.size.width == logical_size.width
&& guard.size.height == logical_size.height
{
return None;
}
layer_surface.set_size(logical_size.width, logical_size.height); layer_surface.set_size(logical_size.width, logical_size.height);
if let Some(viewport) = guard.wp_viewport.as_ref() { if let Some(viewport) = guard.wp_viewport.as_ref() {
// Set inner size without the borders. // Set inner size without the borders.
@ -158,6 +170,11 @@ impl winit::window::Window for SctkWinitWindow {
} }
CommonSurface::Lock(_) => {} CommonSurface::Lock(_) => {}
CommonSurface::Subsurface { .. } => { CommonSurface::Subsurface { .. } => {
if guard.size.width == logical_size.width
&& guard.size.height == logical_size.height
{
return None;
}
guard.requested_size = ( guard.requested_size = (
(logical_size.width > 0).then_some(logical_size.width), (logical_size.width > 0).then_some(logical_size.width),
(logical_size.height > 0).then_some(logical_size.height), (logical_size.height > 0).then_some(logical_size.height),