arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-27 00:48:12 +00:00
Code Issues Releases Wiki Activity

fixup! refactor(core): prepare for non mutable paint function

Browse Source
This commit is contained in:
cepetr 2024-03-14 13:12:42 +01:00
parent 577ede7381
commit dfd6dd4b8b
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/embed/rust/src/ui/model_tt/component/fido.rs
View File

@ -62,7 +62,18 @@ where
page_swipe.allow_right = scrollbar.has_previous_page(); page_swipe.allow_right = scrollbar.has_previous_page();
page_swipe.allow_left = scrollbar.has_next_page(); page_swipe.allow_left = scrollbar.has_next_page();
let current_account = get_account(scrollbar.active_page); // NOTE: This is an ugly hotfix for the erroneous behavior of
// TextLayout used in the account_name Label. In this
// particular case, TextLayout calculates the wrong height of
// fitted text that's higher than the TextLayout bound itself.
//
// The following two lines should be swapped when the problem with
// TextLayout is fixed.
//
// See also, continuation of this hotfix in the place() function.
// let current_account = get_account(scrollbar.active_page);
let current_account = "".into();
Self { Self {
app_name: Label::centered(app_name, theme::TEXT_DEMIBOLD), app_name: Label::centered(app_name, theme::TEXT_DEMIBOLD),
@ -147,6 +158,11 @@ where
self.app_name.place(app_name_area); self.app_name.place(app_name_area);
self.account_name.place(account_name_area); self.account_name.place(account_name_area);
// NOTE: This is a hotfix used due to the erroneous behavior of TextLayout.
// This line should be removed when the problem with TextLayout is fixed.
// See also the code for FidoConfirm::new().
self.account_name.set_text((self.get_account)(self.scrollbar.active_page));
bounds bounds
} }