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

Try to fix window resize race conditons during RedrawRequested

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-10-21 23:56:06 +02:00
parent bfc27e4691
commit d5608162de
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
3 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

26
winit/src/window/state.rs
View file

@ -17,7 +17,6 @@ where
title: String,
scale_factor: f32,
viewport: Viewport,
viewport_version: u64,
cursor_position: Option<winit::dpi::PhysicalPosition<f64>>,
modifiers: winit::keyboard::ModifiersState,
theme: Option<P::Theme>,
@ -35,7 +34,6 @@ where
.field("title", &self.title)
.field("scale_factor", &self.scale_factor)
.field("viewport", &self.viewport)
.field("viewport_version", &self.viewport_version)
.field("cursor_position", &self.cursor_position)
.field("style", &self.style)
.finish()
@ -74,7 +72,6 @@ where
title,
scale_factor,
viewport,
viewport_version: 0,
cursor_position: None,
modifiers: winit::keyboard::ModifiersState::default(),
theme,
@ -89,13 +86,6 @@ where
&self.viewport
}
/// Returns the version of the [`Viewport`] of the [`State`].
///
/// The version is incremented every time the [`Viewport`] changes.
pub fn viewport_version(&self) -> u64 {
self.viewport_version
}
/// Returns the physical [`Size`] of the [`Viewport`] of the [`State`].
pub fn physical_size(&self) -> Size<u32> {
self.viewport.physical_size()
@ -164,8 +154,6 @@ where
size,
window.scale_factor() as f32 * self.scale_factor,
);
self.viewport_version = self.viewport_version.wrapping_add(1);
}
WindowEvent::ScaleFactorChanged {
scale_factor: new_scale_factor,
@ -177,8 +165,6 @@ where
size,
*new_scale_factor as f32 * self.scale_factor,
);
self.viewport_version = self.viewport_version.wrapping_add(1);
}
WindowEvent::CursorMoved { position, .. }
| WindowEvent::Touch(Touch {
@ -225,20 +211,14 @@ where
self.title = new_title;
}
// Update scale factor and size
// Update scale factor
let new_scale_factor = program.scale_factor(window_id);
let new_size = window.inner_size();
let current_size = self.viewport.physical_size();
if self.scale_factor != new_scale_factor
|| (current_size.width, current_size.height)
!= (new_size.width, new_size.height)
{
if self.scale_factor != new_scale_factor {
self.viewport = Viewport::with_physical_size(
Size::new(new_size.width, new_size.height),
self.viewport.physical_size(),
window.scale_factor() as f32 * new_scale_factor,
);
self.viewport_version = self.viewport_version.wrapping_add(1);
self.scale_factor = new_scale_factor;
}