From e405a6305dc124611b0fd25e8ab7daa90684f6cf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 5 Oct 2016 20:36:28 +0200 Subject: [PATCH] use bar_radius where needed --- bootloader/ui-mockup/boot_unsigned.py | 5 ++--- bootloader/ui-mockup/install_fail.py | 5 ++--- bootloader/ui-mockup/install_fw.py | 5 ++--- bootloader/ui-mockup/install_fw_really.py | 5 ++--- bootloader/ui-mockup/install_ok.py | 5 ++--- bootloader/ui-mockup/install_progress.py | 3 +-- bootloader/ui-mockup/install_u_fw.py | 5 ++--- src/trezor/ui/scroll.py | 10 +++++----- 8 files changed, 18 insertions(+), 25 deletions(-) diff --git a/bootloader/ui-mockup/boot_unsigned.py b/bootloader/ui-mockup/boot_unsigned.py index 5ce594a0b..574f3e58f 100755 --- a/bootloader/ui-mockup/boot_unsigned.py +++ b/bootloader/ui-mockup/boot_unsigned.py @@ -25,8 +25,7 @@ ui.display.bar(0, 10, 240, 240 - 50, ui.LIGHT_RED) ui.display.bar(3, 3, 234, 240 - 54, ui.BLACK) # header -ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.ORANGE) +ui.display.bar(0, 0, 240, 32, ui.ORANGE) image = res.load('./res/bootloader.toig') ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) @@ -48,4 +47,4 @@ cancel = button.Button((0, 240 - 48, 240, 48), 'Proceed anyway', normal_style=CA cancel.render() while True: - ui.display.refresh() \ No newline at end of file + ui.display.refresh() diff --git a/bootloader/ui-mockup/install_fail.py b/bootloader/ui-mockup/install_fail.py index 76620cdac..cf9131d79 100755 --- a/bootloader/ui-mockup/install_fail.py +++ b/bootloader/ui-mockup/install_fail.py @@ -26,8 +26,7 @@ ui.display.bar(0, 10, 240, 240 - 50, ui.LIGHT_RED) ui.display.bar(3, 3, 234, 240 - 54, ui.BLACK) # header -ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.ORANGE) +ui.display.bar(0, 0, 240, 32, ui.ORANGE) image = res.load('./res/bootloader.toig') ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) @@ -42,4 +41,4 @@ reboot = button.Button((0, 240 - 48, 240, 48), 'Reboot', normal_style=DEFAULT_BU reboot.render() while True: - if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() diff --git a/bootloader/ui-mockup/install_fw.py b/bootloader/ui-mockup/install_fw.py index 7c470cdba..15884031d 100755 --- a/bootloader/ui-mockup/install_fw.py +++ b/bootloader/ui-mockup/install_fw.py @@ -34,8 +34,7 @@ ui.display.clear() ui.display.backlight(255) # header -ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.ORANGE) +ui.display.bar(0, 0, 240, 32, ui.ORANGE) image = res.load('./res/bootloader.toig') ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) @@ -60,4 +59,4 @@ cancel = button.Button((0, 240 - 48, 119, 48), 'Cancel', normal_style=CANCEL_BUT cancel.render() while True: - if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() diff --git a/bootloader/ui-mockup/install_fw_really.py b/bootloader/ui-mockup/install_fw_really.py index dabd83179..6fb3b03cb 100755 --- a/bootloader/ui-mockup/install_fw_really.py +++ b/bootloader/ui-mockup/install_fw_really.py @@ -22,8 +22,7 @@ ui.display.clear() ui.display.backlight(255) # header -ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.ORANGE) +ui.display.bar(0, 0, 240, 32, ui.ORANGE) image = res.load('./res/bootloader.toig') ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) @@ -42,4 +41,4 @@ confirm = button.Button((0, 240 - 48, 240, 48), 'Hold to confirm', normal_style= confirm.render() while True: - if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() diff --git a/bootloader/ui-mockup/install_ok.py b/bootloader/ui-mockup/install_ok.py index 40adf2084..d072fa803 100755 --- a/bootloader/ui-mockup/install_ok.py +++ b/bootloader/ui-mockup/install_ok.py @@ -22,8 +22,7 @@ ui.display.clear() ui.display.backlight(255) # header -ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.ORANGE) +ui.display.bar(0, 0, 240, 32, ui.ORANGE) image = res.load('./res/bootloader.toig') ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) @@ -39,4 +38,4 @@ reboot = button.Button((0, 240 - 48, 240, 48), 'Reboot', normal_style=DEFAULT_BU reboot.render() while True: - if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() diff --git a/bootloader/ui-mockup/install_progress.py b/bootloader/ui-mockup/install_progress.py index fc873be16..cddbf8aa4 100755 --- a/bootloader/ui-mockup/install_progress.py +++ b/bootloader/ui-mockup/install_progress.py @@ -8,8 +8,7 @@ ui.display.clear() ui.display.backlight(255) # header -ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.ORANGE) +ui.display.bar(0, 0, 240, 32, ui.ORANGE) image = res.load('./res/bootloader.toig') ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) diff --git a/bootloader/ui-mockup/install_u_fw.py b/bootloader/ui-mockup/install_u_fw.py index 19c18ad68..793b5ebed 100755 --- a/bootloader/ui-mockup/install_u_fw.py +++ b/bootloader/ui-mockup/install_u_fw.py @@ -38,8 +38,7 @@ ui.display.bar(0, 10, 240, 240 - 58, ui.LIGHT_RED) ui.display.bar(3, 3, 234, 240 - 54, ui.BLACK) # header -ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) -ui.display.bar(0, 10, 240, 22, ui.ORANGE) +ui.display.bar(0, 0, 240, 32, ui.ORANGE) image = res.load('./res/bootloader.toig') ui.display.icon(8, 4, image, ui.ORANGE, ui.WHITE) @@ -63,4 +62,4 @@ cancel = button.Button((0, 240 - 48, 119, 48), 'Cancel', normal_style=CANCEL_BUT cancel.render() while True: - if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() diff --git a/src/trezor/ui/scroll.py b/src/trezor/ui/scroll.py index c36bd12f1..201511794 100644 --- a/src/trezor/ui/scroll.py +++ b/src/trezor/ui/scroll.py @@ -29,9 +29,9 @@ async def animate_swipe(): def render_swipe_icon(fg): - ui.display.bar(102, 214, 36, 4, fg, ui.BLACK, 2) - ui.display.bar(106, 222, 28, 4, fg, ui.BLACK, 2) - ui.display.bar(110, 230, 20, 4, fg, ui.BLACK, 2) + ui.display.bar_radius(102, 214, 36, 4, fg, ui.BLACK, 2) + ui.display.bar_radius(106, 222, 28, 4, fg, ui.BLACK, 2) + ui.display.bar_radius(110, 230, 20, 4, fg, ui.BLACK, 2) def render_scrollbar(page, page_count): @@ -47,6 +47,6 @@ def render_scrollbar(page, page_count): for i in range(0, page_count): if i != page: - ui.display.bar(x, y + i * padding, size, + ui.display.bar_radius(x, y + i * padding, size, size, ui.DARK_GREY, ui.BLACK, 4) - ui.display.bar(x, y + page * padding, size, size, ui.WHITE, ui.BLACK, 4) + ui.display.bar_radius(x, y + page * padding, size, size, ui.WHITE, ui.BLACK, 4)