arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-31 10:58:43 +00:00
Code Issues Releases Wiki Activity

chore(core/eckhart): extend pin/pp touch area

Browse Source 
[no changelog]
This commit is contained in:
Lukas Bielesch 2025-06-12 12:35:50 +02:00 committed by Lukáš Bielesch
parent 200eac6384
commit 5104872010
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/embed/rust/src/ui/layout_eckhart/firmware/keyboard/passphrase.rs
View File

@ -450,6 +450,7 @@ impl PassphraseInput {
const SHOWN_PADDING: i16 = 24; const SHOWN_PADDING: i16 = 24;
const SHOWN_STYLE: TextStyle = const SHOWN_STYLE: TextStyle =
theme::TEXT_MEDIUM.with_line_breaking(LineBreaking::BreakWordsNoHyphen); theme::TEXT_MEDIUM.with_line_breaking(LineBreaking::BreakWordsNoHyphen);
const SHOWN_TOUCH_OUTSET: Insets = Insets::bottom(200);
const ICON: Icon = theme::ICON_DASH_VERTICAL; const ICON: Icon = theme::ICON_DASH_VERTICAL;
const ICON_WIDTH: i16 = Self::ICON.toif.width(); const ICON_WIDTH: i16 = Self::ICON.toif.width();
const ICON_SPACE: i16 = 12; const ICON_SPACE: i16 = 12;
@ -588,6 +589,13 @@ impl Component for PassphraseInput {
return None; return None;
} }
// Extend the passphrase area downward to allow touch input without the finger
// covering the passphrase
let extended_shown_area = self
.shown_area
.outset(Self::SHOWN_TOUCH_OUTSET)
.clamp(SCREEN);
match event { match event {
// Return touch start if the touch is detected inside the touchable area // Return touch start if the touch is detected inside the touchable area
Event::Touch(TouchEvent::TouchStart(pos)) if self.area.contains(pos) => { Event::Touch(TouchEvent::TouchStart(pos)) if self.area.contains(pos) => {
@ -600,14 +608,16 @@ impl Component for PassphraseInput {
} }
// Return touch end if the touch end is detected inside the visible area // Return touch end if the touch end is detected inside the visible area
Event::Touch(TouchEvent::TouchEnd(pos)) Event::Touch(TouchEvent::TouchEnd(pos))
if self.shown_area.contains(pos) && self.display_style == DisplayStyle::Shown => if extended_shown_area.contains(pos)
&& self.display_style == DisplayStyle::Shown =>
{ {
self.display_style = DisplayStyle::Hidden; self.display_style = DisplayStyle::Hidden;
return Some(PassphraseInputMsg::TouchEnd); return Some(PassphraseInputMsg::TouchEnd);
} }
// Return touch end if the touch moves out of the visible area // Return touch end if the touch moves out of the visible area
Event::Touch(TouchEvent::TouchMove(pos)) Event::Touch(TouchEvent::TouchMove(pos))
if !self.shown_area.contains(pos) && self.display_style == DisplayStyle::Shown => if !extended_shown_area.contains(pos)
&& self.display_style == DisplayStyle::Shown =>
{ {
self.display_style = DisplayStyle::Hidden; self.display_style = DisplayStyle::Hidden;
return Some(PassphraseInputMsg::TouchEnd); return Some(PassphraseInputMsg::TouchEnd);

14
core/embed/rust/src/ui/layout_eckhart/firmware/keyboard/pin.rs
View File

@ -278,6 +278,7 @@ impl PinInput {
const SHOWN_STYLE: TextStyle = theme::TEXT_MEDIUM const SHOWN_STYLE: TextStyle = theme::TEXT_MEDIUM
.with_line_breaking(LineBreaking::BreakWordsNoHyphen) .with_line_breaking(LineBreaking::BreakWordsNoHyphen)
.with_chunks(Chunks::new(1, 8)); .with_chunks(Chunks::new(1, 8));
const SHOWN_TOUCH_OUTSET: Insets = Insets::bottom(200);
const PIN_ICON: Icon = theme::ICON_DASH_VERTICAL; const PIN_ICON: Icon = theme::ICON_DASH_VERTICAL;
const ICON_WIDTH: i16 = Self::PIN_ICON.toif.width(); const ICON_WIDTH: i16 = Self::PIN_ICON.toif.width();
const ICON_SPACE: i16 = 12; const ICON_SPACE: i16 = 12;
@ -438,6 +439,13 @@ impl Component for PinInput {
return None; return None;
} }
// Extend the pin area downward to allow touch input without the finger
// covering the passphrase
let extended_shown_area = self
.shown_area
.outset(Self::SHOWN_TOUCH_OUTSET)
.clamp(SCREEN);
match event { match event {
// Return touch start if the touch is detected inside the touchable area // Return touch start if the touch is detected inside the touchable area
Event::Touch(TouchEvent::TouchStart(pos)) if self.area.contains(pos) => { Event::Touch(TouchEvent::TouchStart(pos)) if self.area.contains(pos) => {
@ -450,14 +458,16 @@ impl Component for PinInput {
} }
// Return touch end if the touch end is detected inside the visible area // Return touch end if the touch end is detected inside the visible area
Event::Touch(TouchEvent::TouchEnd(pos)) Event::Touch(TouchEvent::TouchEnd(pos))
if self.shown_area.contains(pos) && self.display_style == DisplayStyle::Shown => if extended_shown_area.contains(pos)
&& self.display_style == DisplayStyle::Shown =>
{ {
self.display_style = DisplayStyle::Hidden; self.display_style = DisplayStyle::Hidden;
return Some(PinInputMsg::TouchEnd); return Some(PinInputMsg::TouchEnd);
} }
// Return touch end if the touch moves out of the visible area // Return touch end if the touch moves out of the visible area
Event::Touch(TouchEvent::TouchMove(pos)) Event::Touch(TouchEvent::TouchMove(pos))
if !self.shown_area.contains(pos) && self.display_style == DisplayStyle::Shown => if !extended_shown_area.contains(pos)
&& self.display_style == DisplayStyle::Shown =>
{ {
self.display_style = DisplayStyle::Hidden; self.display_style = DisplayStyle::Hidden;
return Some(PinInputMsg::TouchEnd); return Some(PinInputMsg::TouchEnd);