fixup! feat(core/bolt): hide chars in passphrase input

Author: obrusvit

core/embed/rust/src/ui/layout_bolt/component/keyboard/passphrase.rs

@@ -233,18 +233,19 @@ impl Component for PassphraseKeyboard {
     fn place(&mut self, bounds: Rect) -> Rect {
         let bounds = bounds.inset(theme::borders());
 
-        let (input_area, key_grid_area) =
+        let (top_area, key_grid_area) =
             bounds.split_bottom(4 * theme::PIN_BUTTON_HEIGHT + 3 * theme::BUTTON_SPACING);
 
-        let (input_area, scroll_area) = input_area.split_bottom(INPUT_AREA_HEIGHT);
+        let (input_area, scroll_area) = top_area.split_bottom(INPUT_AREA_HEIGHT);
         let (scroll_area, _) = scroll_area.split_top(ScrollBar::DOT_SIZE);
 
         let key_grid = Grid::new(key_grid_area, 4, 3).with_spacing(theme::BUTTON_SPACING);
         let confirm_btn_area = key_grid.cell(11);
         let back_btn_area = key_grid.cell(9);
 
-        self.page_swipe.place(bounds);
+        self.page_swipe.place(key_grid_area);
         self.input.place(input_area);
+        self.input.inner().reveal_area.set(top_area);
         self.confirm.place(confirm_btn_area);
         self.back.place(back_btn_area);
         self.scrollbar.place(scroll_area);
@@ -288,7 +289,6 @@ impl Component for PassphraseKeyboard {
             return None;
         }
 
-        // Handle input touch events (reveal/hide passphrase)
         self.input.event(ctx, event);
 
         // When passphrase is shown in full, disable all keypad interaction
@@ -395,6 +395,9 @@ struct Input {
     display_style: DisplayStyle,
     last_char_timer: Timer,
     pad: Pad,
+    /// Area in which a touch start triggers the passphrase reveal
+    reveal_area: Cell<Rect>,
+    /// Area in which the passphrase reveal window appears
     shown_area: Rect,
 }
 
@@ -408,6 +411,7 @@ impl Input {
     fn new(max_len: usize) -> Self {
         Self {
             area: Rect::zero(),
+            reveal_area: Cell::new(Rect::zero()),
             textbox: TextBox::empty(max_len),
             multi_tap: MultiTapKeyboard::new(),
             display_style: DisplayStyle::Hidden,
@@ -524,6 +528,7 @@ impl Component for Input {
     fn place(&mut self, bounds: Rect) -> Rect {
         self.pad.place(bounds);
         self.area = bounds;
+        self.reveal_area.set(bounds);
         self.area
     }
 
@@ -533,8 +538,8 @@ impl Component for Input {
         }
 
         match event {
-            // Reveal on touch start within the input area
-            Event::Touch(TouchEvent::TouchStart(pos)) if self.area.contains(pos) => {
+            // Reveal on touch start within the extended input area
+            Event::Touch(TouchEvent::TouchStart(pos)) if self.reveal_area.get().contains(pos) => {
                 self.multi_tap.clear_pending_state(ctx);
                 self.last_char_timer.stop();
                 self.display_style = DisplayStyle::Shown;