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

chore(eckhart): Remove redundant code

Browse Source
This commit is contained in:
Lukas Bielesch 2025-02-16 11:46:06 +01:00 committed by Lukáš Bielesch
parent 027770276a
commit 3b2085e27e
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/embed/rust/src/ui/layout_eckhart/component/vertical_menu_screen.rs
View File

@ -8,14 +8,15 @@ use crate::{
}, },
event::{SwipeEvent, TouchEvent}, event::{SwipeEvent, TouchEvent},
geometry::{Alignment2D, Direction, Offset, Rect}, geometry::{Alignment2D, Direction, Offset, Rect},
layout_eckhart::{
component::{constant::screen, Header, HeaderMsg, VerticalMenu, VerticalMenuMsg},
theme,
},
shape::{Renderer, ToifImage}, shape::{Renderer, ToifImage},
}, },
}; };
use super::super::{
component::{constant::SCREEN, Header, HeaderMsg, VerticalMenu, VerticalMenuMsg},
theme,
};
pub struct VerticalMenuScreen { pub struct VerticalMenuScreen {
header: Header, header: Header,
/// Scrollable vertical menu /// Scrollable vertical menu
@ -88,8 +89,8 @@ impl Component for VerticalMenuScreen {
fn place(&mut self, bounds: Rect) -> Rect { fn place(&mut self, bounds: Rect) -> Rect {
// assert full screen // assert full screen
debug_assert_eq!(bounds.height(), screen().height()); debug_assert_eq!(bounds.height(), SCREEN.height());
debug_assert_eq!(bounds.width(), screen().width()); debug_assert_eq!(bounds.width(), SCREEN.width());
let (header_area, menu_area) = bounds.split_top(Header::HEADER_HEIGHT); let (header_area, menu_area) = bounds.split_top(Header::HEADER_HEIGHT);
@ -147,21 +148,8 @@ impl Component for VerticalMenuScreen {
// Shift touch events in the menu area by the current sliding window position // Shift touch events in the menu area by the current sliding window position
if let Some(shifted) = self.shift_touch_event(event) { if let Some(shifted) = self.shift_touch_event(event) {
if let Some(msg) = self.menu.event(ctx, shifted) { if let Some(VerticalMenuMsg::Selected(i)) = self.menu.event(ctx, shifted) {
match msg { return Some(VerticalMenuScreenMsg::Selected(i));
VerticalMenuMsg::Selected(i) => {
return Some(VerticalMenuScreenMsg::Selected(i))
}
_ => {}
}
}
}
// Handle shifted touch events in the menu
if let Some(msg) = self.menu.event(ctx, event) {
match msg {
VerticalMenuMsg::Selected(i) => return Some(VerticalMenuScreenMsg::Selected(i)),
_ => {}
} }
} }