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

ui.loader: add is_active method

Browse Source
This commit is contained in:
Jan Pochyla 2016-10-20 15:07:56 +02:00
parent d94dd32816
commit 4e290cc6df
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/trezor/ui/confirm.py
View File

@ -52,9 +52,10 @@ class HoldToConfirmDialog():
self.loader = Loader(*args, **kwargs)
def render(self):
if not self.loader.render():
if self.content is not None:
self.content.render()
if self.loader.is_active():
self.loader.render()
elif self.content is not None:
self.content.render()
self.button.render()
def send(self, event, pos):

20
src/trezor/ui/loader.py
View File

@ -16,7 +16,7 @@ DEFAULT_LOADER_ACTIVE = {
'icon-fg-color': None,
}
LOADER_MSEC = const(1000)
_LOADER_MSEC = const(1000)
class Loader():
@ -34,25 +34,23 @@ class Loader():
ui.display.bar(0, 32, 240, 240 - 80, ui.BLACK)
ticks_diff = utime.ticks_ms() - self.start_ticks_ms
self.start_ticks_ms = None
return ticks_diff >= LOADER_MSEC
return ticks_diff >= _LOADER_MSEC
def is_active(self):
return self.start_ticks_ms is not None
def render(self):
if self.start_ticks_ms is None:
return False
progress = min(utime.ticks_ms() - self.start_ticks_ms, LOADER_MSEC)
if progress == LOADER_MSEC:
progress = min(utime.ticks_ms() - self.start_ticks_ms, _LOADER_MSEC)
if progress == _LOADER_MSEC:
style = self.active_style
else:
style = self.normal_style
if style['icon'] is None:
ui.display.loader(progress, -8, style['fg-color'], style['bg-color'])
ui.display.loader(
progress, -8, style['fg-color'], style['bg-color'])
elif style['icon-fg-color'] is None:
ui.display.loader(
progress, -8, style['fg-color'], style['bg-color'], style['icon'])
else:
ui.display.loader(
progress, -8, style['fg-color'], style['bg-color'], style['icon'], style['icon-fg-color'])
return True