language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-02 06:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix event loop being blocked because it wouldn't notice that animation is still running

Browse source 
The active_animation was set to false, but if the animation tick did not change, the animation tick
was not maked dirty, and we wouldn't then re-evaluate animated property that would set the
active_animation to true again
This commit is contained in:
Olivier Goffart 2020-12-09 17:25:49 +01:00
parent c72c2a58ff
commit e75f617125
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sixtyfps_runtime/corelib/animations.rs
View file

@ -98,9 +98,11 @@ impl AnimationDriver {
/// Iterates through all animations based on the new time tick and updates their state. This should be called by /// Iterates through all animations based on the new time tick and updates their state. This should be called by
/// the windowing system driver for every frame. /// the windowing system driver for every frame.
pub fn update_animations(&self, new_tick: Instant) { pub fn update_animations(&self, new_tick: Instant) {
if self.global_instant.as_ref().get() != new_tick {
self.active_animations.set(false); self.active_animations.set(false);
self.global_instant.as_ref().set(new_tick); self.global_instant.as_ref().set(new_tick);
} }
}
/// Returns true if there are any active or ready animations. This is used by the windowing system to determine /// Returns true if there are any active or ready animations. This is used by the windowing system to determine
/// if a new animation frame is required or not. Returns false otherwise. /// if a new animation frame is required or not. Returns false otherwise.

2
sixtyfps_runtime/corelib/eventloop.rs
View file

@ -214,6 +214,7 @@ pub(crate) fn unregister_window(id: winit::window::WindowId) {
/// This enum captures run-time specific events that can be dispatched to the event loop in /// This enum captures run-time specific events that can be dispatched to the event loop in
/// addition to the winit events. /// addition to the winit events.
#[derive(Debug)]
pub enum CustomEvent { pub enum CustomEvent {
/// Request for the event loop to wake up and poll. This is used on the web for example to /// Request for the event loop to wake up and poll. This is used on the web for example to
/// request an animation frame. /// request an animation frame.
@ -476,7 +477,6 @@ impl EventLoop {
return; return;
} }
*control_flow = ControlFlow::Poll; *control_flow = ControlFlow::Poll;
//println!("Scheduling a redraw due to active animations");
ALL_WINDOWS.with(|windows| { ALL_WINDOWS.with(|windows| {
windows.borrow().values().for_each(|window| { windows.borrow().values().for_each(|window| {
if let Some(window) = window.upgrade() { if let Some(window) = window.upgrade() {