fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Build time font selection

This commit is contained in:
edgetriggered 2022-08-14 19:58:27 +00:00 committed by Silvano Seva
parent e24007b743
commit a5a0de1428
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -11,6 +11,13 @@ project('OpenRTX', ['c', 'cpp'],
def = {} def = {}
##
## UI font configuration, only one uncommented at a time
##
def += {'FONT_UBUNTU_REGULAR': ''}
# def += {'FONT_FREE_SANS': ''}
## ##
## ----------------- Platform-independent source files ------------------------- ## ----------------- Platform-independent source files -------------------------
## ##

39
openrtx/src/core/graphics.c
View File

@ -42,6 +42,14 @@
#include <FreeSans16pt7b.h> #include <FreeSans16pt7b.h>
#include <FreeSans18pt7b.h> #include <FreeSans18pt7b.h>
#include <FreeSans24pt7b.h> #include <FreeSans24pt7b.h>
#include <UbuntuRegular6pt7b.h>
#include <UbuntuRegular8pt7b.h>
#include <UbuntuRegular9pt7b.h>
#include <UbuntuRegular10pt7b.h>
#include <UbuntuRegular12pt7b.h>
#include <UbuntuRegular16pt7b.h>
#include <UbuntuRegular18pt7b.h>
#include <UbuntuRegular24pt7b.h>
// Variable swap macro // Variable swap macro
#define DEG_RAD 0.017453292519943295769236907684886 #define DEG_RAD 0.017453292519943295769236907684886
@ -51,15 +59,28 @@
/** /**
* Fonts, ordered by the fontSize_t enum. * Fonts, ordered by the fontSize_t enum.
*/ */
static const GFXfont fonts[] = { TomThumb, // 5pt static const GFXfont fonts[] = { TomThumb, // 5pt
FreeSans6pt7b, // 6pt #if defined FONT_FREE_SANS
FreeSans8pt7b, // 8pt FreeSans6pt7b, // 6pt
FreeSans9pt7b, // 9pt FreeSans8pt7b, // 8pt
FreeSans10pt7b, // 10pt FreeSans9pt7b, // 9pt
FreeSans12pt7b, // 12pt FreeSans10pt7b, // 10pt
FreeSans16pt7b, // 16pt FreeSans12pt7b, // 12pt
FreeSans18pt7b, // 16pt FreeSans16pt7b, // 16pt
FreeSans24pt7b // 24pt FreeSans18pt7b, // 16pt
FreeSans24pt7b // 24pt
#elif defined FONT_UBUNTU_REGULAR
UbuntuRegular6pt7b, // 6pt
UbuntuRegular8pt7b, // 8pt
UbuntuRegular9pt7b, // 9pt
UbuntuRegular10pt7b, // 10pt
UbuntuRegular12pt7b, // 12pt
UbuntuRegular16pt7b, // 16pt
UbuntuRegular18pt7b, // 16pt
UbuntuRegular24pt7b // 24pt
#else
#error Unsupported font family!
#endif
}; };
#ifdef PIX_FMT_RGB565 #ifdef PIX_FMT_RGB565