arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-19 03:40:59 +00:00
Code Issues Releases Wiki Activity

fix(core/mercury): disallow swipes when touch starts too close to an edge of the display

Browse Source
This commit is contained in:
tychovrahe 2024-06-18 13:11:36 +02:00 committed by matejcik
parent bfbcecc085
commit 56385f79c7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/embed/rust/src/ui/component/swipe_detect.rs
View File

@ -181,6 +181,21 @@ impl SwipeDetect {
Self::MIN_TRIGGER Self::MIN_TRIGGER
} }
fn is_lockable(&self, dir: SwipeDirection) -> bool {
let Some(origin) = self.origin else {
return false;
};
let min_distance = self.min_trigger() as i16;
match dir {
SwipeDirection::Up => origin.y > min_distance,
SwipeDirection::Down => origin.y < (screen().height() - min_distance),
SwipeDirection::Left => origin.x > min_distance,
SwipeDirection::Right => origin.x < (screen().width() - min_distance),
}
}
fn progress(&self, val: u16) -> u16 { fn progress(&self, val: u16) -> u16 {
((val as f32 / Self::DISTANCE as f32) * Self::PROGRESS_MAX as f32) as u16 ((val as f32 / Self::DISTANCE as f32) * Self::PROGRESS_MAX as f32) as u16
} }
@ -236,7 +251,7 @@ impl SwipeDetect {
let mut res = None; let mut res = None;
for dir in SwipeDirection::iter() { for dir in SwipeDirection::iter() {
let progress = config.progress(dir, ofs, self.min_lock()); let progress = config.progress(dir, ofs, self.min_lock());
if progress > 0 { if progress > 0 && self.is_lockable(dir) {
self.locked = Some(dir); self.locked = Some(dir);
res = Some(SwipeDetectMsg::Start(dir)); res = Some(SwipeDetectMsg::Start(dir));
break; break;