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

fixup! refactor(core): remove UTF-8 support from C

Browse Source
This commit is contained in:
obrusvit 2024-12-09 11:57:52 +01:00
parent dd36660f47
commit 4660ea4d48
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/rust/src/ui/display/font.rs
View File

@ -134,7 +134,7 @@ impl From<Font> for i32 {
impl Font { impl Font {
/// Supports UTF8 characters /// Supports UTF8 characters
pub fn text_width(self, text: &str) -> i16 { pub fn text_width(self, text: &str) -> i16 {
text.chars().fold(0, |acc, c| acc + self.get_glyph(c).adv) text.chars().fold(0, |acc, c| acc + self.char_width(c))
} }
/// Supports UTF8 characters /// Supports UTF8 characters
@ -207,9 +207,7 @@ impl Font {
} }
pub fn char_width(self, ch: char) -> i16 { pub fn char_width(self, ch: char) -> i16 {
let mut buf = [0u8; 4]; self.get_glyph(ch).adv
let encoding = ch.encode_utf8(&mut buf);
self.text_width(encoding)
} }
pub fn text_height(self) -> i16 { pub fn text_height(self) -> i16 {