From b8bb63fbef2beaa703cf71b64d11494c16304944 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 4 Aug 2020 23:20:15 +0200 Subject: [PATCH] core: drop unused FONT_SIZE constant --- core/embed/extmod/modtrezorui/display.h | 1 - core/embed/extmod/modtrezorui/modtrezorui-display.h | 2 -- core/mocks/generated/trezorui.pyi | 1 - core/src/trezor/ui/__init__.py | 1 - 4 files changed, 5 deletions(-) diff --git a/core/embed/extmod/modtrezorui/display.h b/core/embed/extmod/modtrezorui/display.h index 2d8585065..c897833c6 100644 --- a/core/embed/extmod/modtrezorui/display.h +++ b/core/embed/extmod/modtrezorui/display.h @@ -44,7 +44,6 @@ #error Unknown Trezor model #endif -#define FONT_SIZE 20 #define AVATAR_IMAGE_SIZE 144 #define LOADER_ICON_SIZE 64 diff --git a/core/embed/extmod/modtrezorui/modtrezorui-display.h b/core/embed/extmod/modtrezorui/modtrezorui-display.h index 1fbd2c7ae..24f404ad8 100644 --- a/core/embed/extmod/modtrezorui/modtrezorui-display.h +++ b/core/embed/extmod/modtrezorui/modtrezorui-display.h @@ -26,7 +26,6 @@ /// /// WIDTH: int # display width in pixels /// HEIGHT: int # display height in pixels -/// FONT_SIZE: int # font height in pixels /// FONT_MONO: int # id of monospace font /// FONT_NORMAL: int # id of normal-width font /// FONT_BOLD: int # id of bold-width font @@ -596,7 +595,6 @@ STATIC const mp_rom_map_elem_t mod_trezorui_Display_locals_dict_table[] = { MP_ROM_PTR(&mod_trezorui_Display_clear_save_obj)}, {MP_ROM_QSTR(MP_QSTR_WIDTH), MP_ROM_INT(DISPLAY_RESX)}, {MP_ROM_QSTR(MP_QSTR_HEIGHT), MP_ROM_INT(DISPLAY_RESY)}, - {MP_ROM_QSTR(MP_QSTR_FONT_SIZE), MP_ROM_INT(FONT_SIZE)}, {MP_ROM_QSTR(MP_QSTR_FONT_NORMAL), MP_ROM_INT(FONT_NORMAL)}, {MP_ROM_QSTR(MP_QSTR_FONT_BOLD), MP_ROM_INT(FONT_BOLD)}, {MP_ROM_QSTR(MP_QSTR_FONT_MONO), MP_ROM_INT(FONT_MONO)}, diff --git a/core/mocks/generated/trezorui.pyi b/core/mocks/generated/trezorui.pyi index c122d5d96..6e964f562 100644 --- a/core/mocks/generated/trezorui.pyi +++ b/core/mocks/generated/trezorui.pyi @@ -8,7 +8,6 @@ class Display: """ WIDTH: int # display width in pixels HEIGHT: int # display height in pixels - FONT_SIZE: int # font height in pixels FONT_MONO: int # id of monospace font FONT_NORMAL: int # id of normal-width font FONT_BOLD: int # id of bold-width font diff --git a/core/src/trezor/ui/__init__.py b/core/src/trezor/ui/__init__.py index f05b5be11..5fd548135 100644 --- a/core/src/trezor/ui/__init__.py +++ b/core/src/trezor/ui/__init__.py @@ -22,7 +22,6 @@ display = Display() NORMAL = Display.FONT_NORMAL BOLD = Display.FONT_BOLD MONO = Display.FONT_MONO -SIZE = Display.FONT_SIZE WIDTH = Display.WIDTH HEIGHT = Display.HEIGHT