arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-26 14:22:06 +00:00
Code Issues Releases Wiki Activity

fix(core/ui): make it harder to accidentally close VerticalMenu

Browse Source
This commit is contained in:
Martin Milata 2024-05-16 15:28:17 +02:00
parent 30ca8bdd62
commit d2bfe56293
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/rust/src/ui/model_mercury/component/frame.rs
View File

@ -195,10 +195,14 @@ where
fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> { fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
self.title.event(ctx, event); self.title.event(ctx, event);
self.subtitle.event(ctx, event); self.subtitle.event(ctx, event);
let msg = self.content.event(ctx, event).map(FrameMsg::Content);
if msg.is_some() {
return msg;
}
if let Some(ButtonMsg::Clicked) = self.button.event(ctx, event) { if let Some(ButtonMsg::Clicked) = self.button.event(ctx, event) {
return Some(FrameMsg::Button(self.button_msg)); return Some(FrameMsg::Button(self.button_msg));
} }
self.content.event(ctx, event).map(FrameMsg::Content) None
} }
fn paint(&mut self) { fn paint(&mut self) {