arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-27 01:48:17 +00:00
Code Issues Releases Wiki Activity

chore(core/rust): change design of TR's middle button

Browse Source 
Move the text one pixel lower so the arms touch it in its center.
Decreasing the overall height by 2 pixels.

[no changelog]
This commit is contained in:
grdddj 2023-07-13 09:56:34 +02:00 committed by Jiří Musil
parent a520c1b9e4
commit e31eb9570b
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/embed/rust/src/ui/model_tr/component/button.rs
View File

@ -137,7 +137,13 @@ where
} }
}; };
let button_bounds = self.bounds.split_bottom(theme::BUTTON_HEIGHT).1; // Arms should connect to the center, therefore decreasing the height
let button_height = if style.with_arms {
theme::BUTTON_HEIGHT - 2
} else {
theme::BUTTON_HEIGHT
};
let button_bounds = self.bounds.split_bottom(button_height).1;
match self.pos { match self.pos {
ButtonPos::Left => button_bounds.split_left(button_width).0, ButtonPos::Left => button_bounds.split_left(button_width).0,
ButtonPos::Right => button_bounds.split_right(button_width).1, ButtonPos::Right => button_bounds.split_right(button_width).1,
@ -148,19 +154,13 @@ where
/// Determine baseline point for the text. /// Determine baseline point for the text.
fn get_text_baseline(&self, style: &ButtonStyle) -> Point { fn get_text_baseline(&self, style: &ButtonStyle) -> Point {
// Arms and outline require the text to be elevated. // Arms and outline require the text to be elevated.
let offset_y = if style.with_outline || style.with_arms { // Moving text to the right and elevating it for arms and outline.
theme::BUTTON_OUTLINE let (mut offset_x, offset_y) = if style.with_outline {
} else { (theme::BUTTON_OUTLINE, theme::BUTTON_OUTLINE)
0
};
// Moving text to the right.
let mut offset_x = if style.with_outline {
theme::BUTTON_OUTLINE
} else if style.with_arms { } else if style.with_arms {
theme::ARMS_MARGIN (theme::ARMS_MARGIN, theme::ARMS_MARGIN)
} else { } else {
0 (0, 0)
}; };
// Centering the text in case of fixed width. // Centering the text in case of fixed width.
@ -211,16 +211,14 @@ where
// Optionally display "arms" at both sides of content - always in FG and BG // Optionally display "arms" at both sides of content - always in FG and BG
// colors (they are not inverted). // colors (they are not inverted).
if style.with_arms { if style.with_arms {
// Putting them one pixel down to touch the bottom.
let arms_area = area.translate(Offset::y(1));
theme::ICON_ARM_LEFT.draw( theme::ICON_ARM_LEFT.draw(
arms_area.left_center(), area.left_center(),
Alignment2D::TOP_RIGHT, Alignment2D::TOP_RIGHT,
theme::FG, theme::FG,
theme::BG, theme::BG,
); );
theme::ICON_ARM_RIGHT.draw( theme::ICON_ARM_RIGHT.draw(
arms_area.right_center(), area.right_center(),
Alignment2D::TOP_LEFT, Alignment2D::TOP_LEFT,
theme::FG, theme::FG,
theme::BG, theme::BG,