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

fix(core/ui): render_text uses correct font and color with item_offset

Browse Source
This commit is contained in:
matejcik 2021-01-04 11:43:11 +01:00 committed by matejcik
parent e23e35332d
commit 2d3a4d15fa
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/trezor/ui/text.py
View File

@ -221,7 +221,6 @@ def render_text(
the first character of the indicated item which should be considered. the first character of the indicated item which should be considered.
The purpose is to allow rendering different "pages" of text, using the same `items` The purpose is to allow rendering different "pages" of text, using the same `items`
argument (slicing the list could be expensive in terms of memory). argument (slicing the list could be expensive in terms of memory).
The item selected by `item_offset` must be a string.
If `break_words` is false (default), linebreaks will only be rendered (a) at If `break_words` is false (default), linebreaks will only be rendered (a) at
whitespace, or (b) in case a word does not fit on a single line. If true, whitespace whitespace, or (b) in case a word does not fit on a single line. If true, whitespace
@ -229,10 +228,23 @@ def render_text(
""" """
# initial rendering state # initial rendering state
INITIAL_OFFSET_X = offset_x INITIAL_OFFSET_X = offset_x
SPACE = ui.display.text_width(" ", font)
offset_y_max = TEXT_HEADER_HEIGHT + (TEXT_LINE_HEIGHT * max_lines) offset_y_max = TEXT_HEADER_HEIGHT + (TEXT_LINE_HEIGHT * max_lines)
span = _WORKING_SPAN span = _WORKING_SPAN
# scan through up to item_offset so that the current font & color is up to date
for item_index in range(item_offset):
item = items[item_index]
if isinstance(item, int):
if item is BR or item is BR_HALF:
# do nothing
pass
elif item in _FONTS:
font = item
else:
fg = item
SPACE = ui.display.text_width(" ", font)
for item_index in range(item_offset, len(items)): for item_index in range(item_offset, len(items)):
# load current item # load current item
item = items[item_index] item = items[item_index]