arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-03-03 16:56:07 +00:00
Code Issues Releases Wiki Activity

fix(core): fix delizia htc anim spurious start

Browse Source 
[no changelog]
This commit is contained in:
obrusvit 2025-03-02 13:17:18 +01:00
parent 587b5e8eb8
commit 9ad68f9ce3
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/embed/rust/src/ui/layout_delizia/component/hold_to_confirm.rs
View File

@ -181,7 +181,8 @@ impl HoldToConfirm {
let button = Button::new(ButtonContent::Empty) let button = Button::new(ButtonContent::Empty)
.styled(theme::button_default()) .styled(theme::button_default())
.with_long_press(Duration::from_millis(2200)) .with_long_press(Duration::from_millis(2200))
.without_haptics(); .without_haptics()
.initially_enabled(false);
Self { Self {
title: Label::new( title: Label::new(
TR::instructions__continue_holding.into(), TR::instructions__continue_holding.into(),
@ -256,19 +257,35 @@ impl Component for HoldToConfirm {
_ => (), _ => (),
} }
if let Event::Timer(EventCtx::ANIM_FRAME_TIMER) = event { match event {
if self.anim.is_active() { Event::Attach(_) => {
// Reset state on attach and disable button
self.anim.reset();
self.button.disable(ctx);
ctx.request_anim_frame(); ctx.request_anim_frame();
ctx.request_paint(); ctx.request_paint();
if self.anim.is_locked() && !self.finalizing {
self.finalizing = true;
#[cfg(feature = "haptic")]
haptic::play(HapticEffect::HoldToConfirm);
}
} else if self.anim.is_locked() {
return Some(());
} }
Event::Timer(EventCtx::ANIM_FRAME_TIMER) => {
// Handle animation frames
if !self.button.is_enabled() && !self.anim.is_active() {
self.button.enable(ctx);
ctx.request_paint();
}
if self.anim.is_active() {
ctx.request_anim_frame();
ctx.request_paint();
if self.anim.is_locked() && !self.finalizing {
self.finalizing = true;
#[cfg(feature = "haptic")]
haptic::play(HapticEffect::HoldToConfirm);
}
} else if self.anim.is_locked() {
return Some(());
}
}
_ => {}
} }
None None
} }