piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fonts refactoring (no more font list in libopenui)

Browse Source
This commit is contained in:
Bertrand Songis
2019-10-22 10:25:18 +02:00
parent 1d8c5d38e4
commit 8bd4f0b7de
35 changed files with 175 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/horus/libopenui_config.h
+14 -4
View File
@@ -129,11 +129,21 @@ enum LcdColorIndex
LCD_COLOR_COUNT
};
#if !defined(BOOT)
#define FONT_TABLE_SIZE 16
#else
#define FONT_TABLE_SIZE 1
enum FontIndex
{
FONT_STD_INDEX,
#if !defined(BOLD)
FONT_BOLD_INDEX,
FONT_XXS_INDEX,
FONT_XS_INDEX,
FONT_L_INDEX,
FONT_XL_INDEX,
FONT_XXL_INDEX,
#endif
FONTS_COUNT
};
#define FONT(xx) (FONT_ ## xx ## _INDEX << 8)
constexpr uint32_t INPUT_EDIT_LABELS_WIDTH = 120;
constexpr coord_t INPUT_EDIT_CURVE_WIDTH = 158;
radio/src/targets/nv14/libopenui_config.h
+14 -4
View File
@@ -127,11 +127,21 @@ enum LcdColorIndex
LCD_COLOR_COUNT
};
#if !defined(BOOT)
#define FONT_TABLE_SIZE 16
#else
#define FONT_TABLE_SIZE 1
enum FontIndex
{
FONT_STD_INDEX,
#if !defined(BOLD)
FONT_BOLD_INDEX,
FONT_XXS_INDEX,
FONT_XS_INDEX,
FONT_L_INDEX,
FONT_XL_INDEX,
FONT_XXL_INDEX,
#endif
FONTS_COUNT
};
#define FONT(xx) (FONT_ ## xx ## _INDEX << 8)
constexpr uint32_t INPUT_EDIT_LABELS_WIDTH = 80;
constexpr coord_t INPUT_EDIT_CURVE_WIDTH = LCD_W;