arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-20 14:39:22 +00:00
Code Issues Releases Wiki Activity

fix(core/rust): fix glyph positioning in TextOverlay

Browse Source
This commit is contained in:
tychovrahe 2022-10-20 12:55:23 +02:00 committed by Martin Milata
parent e30fdddd83
commit 659c939080
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/embed/rust/src/ui/display/mod.rs
View File

@ -103,12 +103,21 @@ pub struct TextOverlay<'a> {
area: Rect,
text: &'a str,
font: Font,
max_height: i16,
baseline: i16,
}
impl<'a> TextOverlay<'a> {
pub fn new(text: &'a str, font: Font) -> Self {
let area = Rect::zero();
Self { area, text, font }
Self {
area,
text,
font,
max_height: font.max_height(),
baseline: font.baseline(),
}
}
pub fn place(&mut self, baseline: Point) {
@ -132,9 +141,10 @@ impl<'a> TextOverlay<'a> {
let p_rel = Point::new(p.x - self.area.x0, p.y - self.area.y0);
for g in self.text.bytes().filter_map(|c| self.font.get_glyph(c)) {
let top = self.max_height - self.baseline - g.bearing_y;
let char_area = Rect::new(
Point::new(tot_adv + g.bearing_x, g.height - g.bearing_y),
Point::new(tot_adv + g.bearing_x + g.width, g.bearing_y),
Point::new(tot_adv + g.bearing_x, top),
Point::new(tot_adv + g.bearing_x + g.width, top + g.height),
);
tot_adv += g.adv;
@ -1025,6 +1035,14 @@ impl Font {
display::text_baseline(self.into())
}
pub fn max_height(self) -> i16 {
display::text_max_height(self.into()) as i16
}
pub fn baseline(self) -> i16 {
display::text_baseline(self.into()) as i16
}
pub fn line_height(self) -> i16 {
constant::LINE_SPACE + self.text_height()
}