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

feat(core/rust): allow for margin between text and ellipsis icon

Browse Source
This commit is contained in:
grdddj 2023-05-04 16:17:19 +02:00 committed by Martin Milata
parent 1c698656c3
commit c4bbf17433
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/embed/rust/src/ui/component/text/layout.rs
View File

@ -65,10 +65,12 @@ pub struct TextStyle {
pub hyphen_color: Color, pub hyphen_color: Color,
/// Foreground color used for drawing the ellipsis. /// Foreground color used for drawing the ellipsis.
pub ellipsis_color: Color, pub ellipsis_color: Color,
/// Optional icon shown as ellipsis.
pub ellipsis_icon: Option<Icon>, /// Optional icon shown as ellipsis, including its margin from text.
/// Optional icon to signal content continues from previous page. pub ellipsis_icon: Option<(Icon, i16)>,
pub prev_page_ellipsis_icon: Option<Icon>, /// Optional icon to signal content continues from previous page,
/// including text margin.
pub prev_page_ellipsis_icon: Option<(Icon, i16)>,
/// Specifies which line-breaking strategy to use. /// Specifies which line-breaking strategy to use.
pub line_breaking: LineBreaking, pub line_breaking: LineBreaking,
@ -108,28 +110,28 @@ impl TextStyle {
} }
/// Adding optional icon shown instead of "..." ellipsis. /// Adding optional icon shown instead of "..." ellipsis.
pub const fn with_ellipsis_icon(mut self, icon: Icon) -> Self { pub const fn with_ellipsis_icon(mut self, icon: Icon, margin: i16) -> Self {
self.ellipsis_icon = Some(icon); self.ellipsis_icon = Some((icon, margin));
self self
} }
/// Adding optional icon signalling content continues from previous page. /// Adding optional icon signalling content continues from previous page.
pub const fn with_prev_page_icon(mut self, icon: Icon) -> Self { pub const fn with_prev_page_icon(mut self, icon: Icon, margin: i16) -> Self {
self.prev_page_ellipsis_icon = Some(icon); self.prev_page_ellipsis_icon = Some((icon, margin));
self self
} }
fn ellipsis_width(&self) -> i16 { fn ellipsis_width(&self) -> i16 {
if let Some(icon) = self.ellipsis_icon { if let Some((icon, margin)) = self.ellipsis_icon {
icon.toif.width() icon.toif.width() + margin
} else { } else {
self.text_font.text_width(ELLIPSIS) self.text_font.text_width(ELLIPSIS)
} }
} }
fn prev_page_ellipsis_width(&self) -> i16 { fn prev_page_ellipsis_width(&self) -> i16 {
if let Some(icon) = self.prev_page_ellipsis_icon { if let Some((icon, margin)) = self.prev_page_ellipsis_icon {
icon.toif.width() icon.toif.width() + margin
} else { } else {
self.text_font.text_width(ELLIPSIS) self.text_font.text_width(ELLIPSIS)
} }
@ -435,7 +437,7 @@ impl LayoutSink for TextRenderer {
fn ellipsis(&mut self, cursor: Point, layout: &TextLayout) { fn ellipsis(&mut self, cursor: Point, layout: &TextLayout) {
if let Some((icon, margin)) = layout.style.ellipsis_icon { if let Some((icon, margin)) = layout.style.ellipsis_icon {
let bottom_left = cursor + Offset::new(margin, 1); let bottom_left = cursor + Offset::x(margin);
icon.draw( icon.draw(
bottom_left, bottom_left,
BOTTOM_LEFT, BOTTOM_LEFT,