arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 17:38:39 +00:00
Code Issues Releases Wiki Activity

refactor(core): remove lockscreen lifetimes

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-05-29 14:23:04 +02:00 committed by TychoVrahe
parent e03d404dca
commit 51c1ff728d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/embed/rust/src/ui/model_mercury/component/homescreen.rs
View File

@ -291,17 +291,17 @@ impl LockscreenAnim {
} }
} }
pub struct Lockscreen<'a> { pub struct Lockscreen {
anim: LockscreenAnim, anim: LockscreenAnim,
label: TString<'a>, label: TString<'static>,
image: BinaryData<'static>, image: BinaryData<'static>,
bootscreen: bool, bootscreen: bool,
coinjoin_authorized: bool, coinjoin_authorized: bool,
bg_image: ImageBuffer<Rgb565Canvas<'static>>, bg_image: ImageBuffer<Rgb565Canvas<'static>>,
} }
impl<'a> Lockscreen<'a> { impl Lockscreen {
pub fn new(label: TString<'a>, bootscreen: bool, coinjoin_authorized: bool) -> Self { pub fn new(label: TString<'static>, bootscreen: bool, coinjoin_authorized: bool) -> Self {
let image = get_homescreen_image(); let image = get_homescreen_image();
let mut buf = unwrap!(ImageBuffer::new(AREA.size()), "no image buf"); let mut buf = unwrap!(ImageBuffer::new(AREA.size()), "no image buf");
@ -320,7 +320,7 @@ impl<'a> Lockscreen<'a> {
} }
} }
impl Component for Lockscreen<'_> { impl Component for Lockscreen {
type Msg = HomescreenMsg; type Msg = HomescreenMsg;
fn place(&mut self, bounds: Rect) -> Rect { fn place(&mut self, bounds: Rect) -> Rect {
@ -468,7 +468,7 @@ fn get_homescreen_image() -> BinaryData<'static> {
} }
#[cfg(feature = "ui_debug")] #[cfg(feature = "ui_debug")]
impl crate::trace::Trace for Lockscreen<'_> { impl crate::trace::Trace for Lockscreen {
fn trace(&self, t: &mut dyn crate::trace::Tracer) { fn trace(&self, t: &mut dyn crate::trace::Tracer) {
t.component("Lockscreen"); t.component("Lockscreen");
} }

2
core/embed/rust/src/ui/model_mercury/layout.rs
View File

@ -271,7 +271,7 @@ impl ComponentMsgObj for Homescreen {
} }
} }
impl ComponentMsgObj for Lockscreen<'_> { impl ComponentMsgObj for Lockscreen {
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> { fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
match msg { match msg {
HomescreenMsg::Dismissed => Ok(CANCELLED.as_obj()), HomescreenMsg::Dismissed => Ok(CANCELLED.as_obj()),