From c2a117424e7f93ce7c42e5272896236d78d3b04d Mon Sep 17 00:00:00 2001 From: cepetr Date: Thu, 2 May 2024 08:38:21 +0200 Subject: [PATCH] fixup! feat(core): integrate new drawing library --- core/embed/rust/src/ui/layout/simplified.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/embed/rust/src/ui/layout/simplified.rs b/core/embed/rust/src/ui/layout/simplified.rs index 67c7089425..176de577ad 100644 --- a/core/embed/rust/src/ui/layout/simplified.rs +++ b/core/embed/rust/src/ui/layout/simplified.rs @@ -67,10 +67,7 @@ fn touch_eval() -> Option { TouchEvent::new(event_type, ex as _, ey as _).ok() } -fn render(frame: &mut F) -where - F: Component, -{ +fn render(frame: &mut impl Component) { #[cfg(not(feature = "new_rendering"))] { display::sync(); @@ -88,11 +85,7 @@ where } } -pub fn run(frame: &mut F) -> u32 -where - F: Component, - F::Msg: ReturnToC, -{ +pub fn run(frame: &mut impl Component) -> u32 { frame.place(ModelUI::SCREEN); ModelUI::fadeout(); render(frame); @@ -121,10 +114,7 @@ where } } -pub fn show(frame: &mut F, fading: bool) -where - F: Component, -{ +pub fn show(frame: &mut impl Component, fading: bool) { frame.place(ModelUI::SCREEN); if fading {