language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-11-11 16:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix the slint_mock_elapsed_time when not using the testing backend

Browse source 
The nodejs tests don't use the testing backend, as a result, calling
`platform::update_timers_and_animations` would use the real time instead
of the fake time.
So call `maybe_activate_timers` with the fake time instead
This commit is contained in:
Olivier Goffart 2022-09-16 11:30:48 +02:00 • committed by Olivier Goffart
parent f954cb4ced
commit adb1b24c28
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/core/platform.rs
View file

@ -166,7 +166,7 @@ pub fn set_platform(platform: Box<dyn Platform + 'static>) -> Result<(), SetPlat
/// This function should be called before rendering or processing input event, at the /// This function should be called before rendering or processing input event, at the
/// beginning of each event loop iteration. /// beginning of each event loop iteration.
pub fn update_timers_and_animations() { pub fn update_timers_and_animations() {
crate::timers::TimerList::maybe_activate_timers(); crate::timers::TimerList::maybe_activate_timers(crate::animations::Instant::now());
crate::animations::update_animations(); crate::animations::update_animations();
} }

7
internal/core/tests.rs
View file

@ -16,12 +16,13 @@ use crate::SharedString;
/// This function will add some milliseconds to the fake time /// This function will add some milliseconds to the fake time
#[no_mangle] #[no_mangle]
pub extern "C" fn slint_mock_elapsed_time(time_in_ms: u64) { pub extern "C" fn slint_mock_elapsed_time(time_in_ms: u64) {
crate::animations::CURRENT_ANIMATION_DRIVER.with(|driver| { let tick = crate::animations::CURRENT_ANIMATION_DRIVER.with(|driver| {
let mut tick = driver.current_tick(); let mut tick = driver.current_tick();
tick += core::time::Duration::from_millis(time_in_ms); tick += core::time::Duration::from_millis(time_in_ms);
driver.update_animations(tick) driver.update_animations(tick);
tick
}); });
crate::platform::update_timers_and_animations(); crate::timers::TimerList::maybe_activate_timers(tick);
} }
/// Simulate a click on a position within the component. /// Simulate a click on a position within the component.

3
internal/core/timers.rs
View file

@ -214,8 +214,7 @@ impl TimerList {
/// Activates any expired timers by calling their callback function. Returns true if any timers were /// Activates any expired timers by calling their callback function. Returns true if any timers were
/// activated; false otherwise. /// activated; false otherwise.
pub fn maybe_activate_timers() -> bool { pub fn maybe_activate_timers(now: Instant) -> bool {
let now = Instant::now();
// Shortcut: Is there any timer worth activating? // Shortcut: Is there any timer worth activating?
if TimerList::next_timeout().map(|timeout| now < timeout).unwrap_or(false) { if TimerList::next_timeout().map(|timeout| now < timeout).unwrap_or(false) {
return false; return false;