From 283baa412aaacfa019e512844cebcc5328939a4a Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Wed, 19 Jun 2024 21:24:42 +0200 Subject: [PATCH] fix(core): fix backlight fading when first painting a layout [no changelog] --- core/src/trezor/ui/layouts/mercury/__init__.py | 8 ++++---- core/src/trezor/ui/layouts/mercury/fido.py | 2 +- core/src/trezor/ui/layouts/mercury/homescreen.py | 2 +- core/src/trezor/ui/layouts/tr/__init__.py | 4 ++-- core/src/trezor/ui/layouts/tt/__init__.py | 8 ++++---- core/src/trezor/ui/layouts/tt/fido.py | 2 +- core/src/trezor/ui/layouts/tt/homescreen.py | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/src/trezor/ui/layouts/mercury/__init__.py b/core/src/trezor/ui/layouts/mercury/__init__.py index e12a840dc..c955c293a 100644 --- a/core/src/trezor/ui/layouts/mercury/__init__.py +++ b/core/src/trezor/ui/layouts/mercury/__init__.py @@ -65,8 +65,8 @@ class RustLayout(ui.Layout): def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: if context.CURRENT_CONTEXT: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_swipe(), self.handle_click_signal(), self.handle_result_signal(), @@ -74,8 +74,8 @@ class RustLayout(ui.Layout): ) else: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_swipe(), self.handle_click_signal(), self.handle_result_signal(), @@ -180,14 +180,14 @@ class RustLayout(ui.Layout): def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: if context.CURRENT_CONTEXT: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_usb(context.get_context()), ) else: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), ) def _first_paint(self) -> None: diff --git a/core/src/trezor/ui/layouts/mercury/fido.py b/core/src/trezor/ui/layouts/mercury/fido.py index b7bcacbd5..677232519 100644 --- a/core/src/trezor/ui/layouts/mercury/fido.py +++ b/core/src/trezor/ui/layouts/mercury/fido.py @@ -18,8 +18,8 @@ if __debug__: class _RustFidoLayoutImpl(RustLayout): def create_tasks(self) -> tuple[AwaitableTask, ...]: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_swipe(), self.handle_debug_confirm(), ) diff --git a/core/src/trezor/ui/layouts/mercury/homescreen.py b/core/src/trezor/ui/layouts/mercury/homescreen.py index da8021b2d..7089e8e5f 100644 --- a/core/src/trezor/ui/layouts/mercury/homescreen.py +++ b/core/src/trezor/ui/layouts/mercury/homescreen.py @@ -33,8 +33,8 @@ class HomescreenBase(RustLayout): # In __debug__ mode, ignore {confirm,swipe,input}_signal. def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_click_signal(), # so we can receive debug events ) diff --git a/core/src/trezor/ui/layouts/tr/__init__.py b/core/src/trezor/ui/layouts/tr/__init__.py index 8b0d98e4e..0be6ee23b 100644 --- a/core/src/trezor/ui/layouts/tr/__init__.py +++ b/core/src/trezor/ui/layouts/tr/__init__.py @@ -226,14 +226,14 @@ class RustLayout(LayoutParentType[T]): def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: if context.CURRENT_CONTEXT: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_usb(context.get_context()), ) else: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), ) def _first_paint(self) -> None: diff --git a/core/src/trezor/ui/layouts/tt/__init__.py b/core/src/trezor/ui/layouts/tt/__init__.py index 4d7aa9d05..6d532991d 100644 --- a/core/src/trezor/ui/layouts/tt/__init__.py +++ b/core/src/trezor/ui/layouts/tt/__init__.py @@ -71,8 +71,8 @@ class RustLayout(LayoutParentType[T]): def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: if context.CURRENT_CONTEXT: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_swipe(), self.handle_click_signal(), self.handle_result_signal(), @@ -80,8 +80,8 @@ class RustLayout(LayoutParentType[T]): ) else: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_swipe(), self.handle_click_signal(), self.handle_result_signal(), @@ -186,14 +186,14 @@ class RustLayout(LayoutParentType[T]): def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: if context.CURRENT_CONTEXT: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_usb(context.get_context()), ) else: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), ) def _first_paint(self) -> None: diff --git a/core/src/trezor/ui/layouts/tt/fido.py b/core/src/trezor/ui/layouts/tt/fido.py index 390fb4b7e..622e19958 100644 --- a/core/src/trezor/ui/layouts/tt/fido.py +++ b/core/src/trezor/ui/layouts/tt/fido.py @@ -18,8 +18,8 @@ if __debug__: class _RustFidoLayoutImpl(RustLayout): def create_tasks(self) -> tuple[AwaitableTask, ...]: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_swipe(), self.handle_debug_confirm(), ) diff --git a/core/src/trezor/ui/layouts/tt/homescreen.py b/core/src/trezor/ui/layouts/tt/homescreen.py index da8021b2d..7089e8e5f 100644 --- a/core/src/trezor/ui/layouts/tt/homescreen.py +++ b/core/src/trezor/ui/layouts/tt/homescreen.py @@ -33,8 +33,8 @@ class HomescreenBase(RustLayout): # In __debug__ mode, ignore {confirm,swipe,input}_signal. def create_tasks(self) -> tuple[loop.AwaitableTask, ...]: return ( - self.handle_timers(), self.handle_input_and_rendering(), + self.handle_timers(), self.handle_click_signal(), # so we can receive debug events )