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

refactor(core/rust): return bounding box after laying out text

Browse Source 
[no changelog]
This commit is contained in:
Martin Milata 2021-12-13 12:28:59 +01:00 committed by matejcik
parent 7271606ca2
commit 48f29ee0b9
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,7 @@ impl TextLayout {
cursor: &mut Point, cursor: &mut Point,
sink: &mut dyn LayoutSink, sink: &mut dyn LayoutSink,
) -> LayoutFit { ) -> LayoutFit {
let init_cursor: Point = *cursor;
let mut total_processed_chars = 0; let mut total_processed_chars = 0;
for op in ops { for op in ops {
@ -114,7 +115,9 @@ impl TextLayout {
self.text_font = font; self.text_font = font;
} }
Op::Text(text) => match self.layout_text(text, cursor, sink) { Op::Text(text) => match self.layout_text(text, cursor, sink) {
LayoutFit::Fitting { processed_chars } => { LayoutFit::Fitting {
processed_chars, ..
} => {
total_processed_chars += processed_chars; total_processed_chars += processed_chars;
} }
LayoutFit::OutOfBounds { processed_chars } => { LayoutFit::OutOfBounds { processed_chars } => {
@ -130,6 +133,10 @@ impl TextLayout {
LayoutFit::Fitting { LayoutFit::Fitting {
processed_chars: total_processed_chars, processed_chars: total_processed_chars,
size: Offset::new(
self.bounds.width(),
cursor.y - init_cursor.y + self.text_font.line_height(),
),
} }
} }
@ -139,6 +146,7 @@ impl TextLayout {
cursor: &mut Point, cursor: &mut Point,
sink: &mut dyn LayoutSink, sink: &mut dyn LayoutSink,
) -> LayoutFit { ) -> LayoutFit {
let init_cursor: Point = *cursor;
let mut remaining_text = text; let mut remaining_text = text;
while !remaining_text.is_empty() { while !remaining_text.is_empty() {
@ -202,30 +210,35 @@ impl TextLayout {
LayoutFit::Fitting { LayoutFit::Fitting {
processed_chars: text.len(), processed_chars: text.len(),
size: Offset::new(
self.bounds.width(),
cursor.y - init_cursor.y + self.text_font.line_height(),
),
} }
} }
pub fn measure_ops_height(self, ops: &mut dyn Iterator<Item = Op>) -> i32 { pub fn measure_ops_height(self, ops: &mut dyn Iterator<Item = Op>) -> i32 {
// TODO: Return the bounding box in `LayoutFit` instead of computing it from the match self.layout_ops(ops, &mut self.initial_cursor(), &mut TextNoOp) {
// cursor. LayoutFit::Fitting { size, .. } => size.y,
let init_cursor = self.initial_cursor(); LayoutFit::OutOfBounds { .. } => self.bounds.height(),
let mut cursor = init_cursor; }
self.layout_ops(ops, &mut cursor, &mut TextNoOp);
cursor.y - init_cursor.y + self.text_font.line_height()
} }
pub fn measure_text_height(self, text: &[u8]) -> i32 { pub fn measure_text_height(self, text: &[u8]) -> i32 {
// TODO: Return the bounding box in `LayoutFit` instead of computing it from the match self.layout_text(text, &mut self.initial_cursor(), &mut TextNoOp) {
// cursor. LayoutFit::Fitting { size, .. } => size.y,
let init_cursor = self.initial_cursor(); LayoutFit::OutOfBounds { .. } => self.bounds.height(),
let mut cursor = init_cursor; }
self.layout_text(text, &mut cursor, &mut TextNoOp);
cursor.y - init_cursor.y + self.text_font.line_height()
} }
} }
pub enum LayoutFit { pub enum LayoutFit {
Fitting { processed_chars: usize }, /// Entire content fits. Bounding box is returned in `size`.
Fitting {
processed_chars: usize,
size: Offset,
},
/// Content fits partially or not at all.
OutOfBounds { processed_chars: usize }, OutOfBounds { processed_chars: usize },
} }