From 108d9c737e9a55777f90d8b954f8a92f52ec16b0 Mon Sep 17 00:00:00 2001 From: obrusvit Date: Thu, 18 Jul 2024 16:21:33 +0200 Subject: [PATCH] feat(core/mercury): add rounded overlay to keypads Make the corner keys of passphrase and mnemonic keyboards rounded by an overlay, similarly to PIN keyboard. [no changelog] --- .../component/keyboard/mnemonic.rs | 12 +- .../component/keyboard/passphrase.rs | 20 +- tests/ui_tests/fixtures.json | 586 +++++++++--------- 3 files changed, 316 insertions(+), 302 deletions(-) diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs index 242c1ea2b..181012c06 100644 --- a/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs +++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs @@ -8,7 +8,7 @@ use crate::{ geometry::{Alignment, Grid, Insets, Rect}, model_mercury::{ component::{Button, ButtonMsg}, - theme, + cshape, theme, }, shape::Renderer, }, @@ -31,6 +31,8 @@ pub struct MnemonicKeyboard { back: Child>, /// Input area, acting as the auto-complete and confirm button. input: Child>, + /// Area with keypads - used for rounded overlay + keypad_area: Rect, /// Key buttons. keys: [Child