Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 16:28:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove scumm roman font from fw flash --nobuild

Browse Source
This commit is contained in:
Willy-JL
2024-02-09 17:00:57 +00:00
parent b4695ef0aa
commit 92b44c4351
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/external

Submodule applications/external updated: b29a5871ca...26906fdec2

9
applications/services/gui/canvas.c
View File

@@ -14,9 +14,6 @@ const CanvasFontParameters canvas_font_params[FontTotalNumber] = {
[FontKeyboard] = {.leading_default = 11, .leading_min = 9, .height = 7, .descender = 2}, [FontKeyboard] = {.leading_default = 11, .leading_min = 9, .height = 7, .descender = 2},
[FontBigNumbers] = {.leading_default = 18, .leading_min = 16, .height = 15, .descender = 0}, [FontBigNumbers] = {.leading_default = 18, .leading_min = 16, .height = 15, .descender = 0},
[FontBatteryPercent] = {.leading_default = 11, .leading_min = 9, .height = 6, .descender = 0}, [FontBatteryPercent] = {.leading_default = 11, .leading_min = 9, .height = 6, .descender = 0},
[FontScummRomanOutline] =
{.leading_default = 12, .leading_min = 11, .height = 12, .descender = 2},
[FontScummRoman] = {.leading_default = 12, .leading_min = 11, .height = 10, .descender = 2},
[FontEurocorp] = {.leading_default = 12, .leading_min = 11, .height = 16, .descender = 2}, [FontEurocorp] = {.leading_default = 12, .leading_min = 11, .height = 16, .descender = 2},
}; };
@@ -201,12 +198,6 @@ void canvas_set_font(Canvas* canvas, Font font) {
case FontBatteryPercent: case FontBatteryPercent:
u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tf); //u8g2_font_micro_tr); u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tf); //u8g2_font_micro_tr);
break; break;
case FontScummRomanOutline:
u8g2_SetFont(&canvas->fb, u8g2_font_lucasarts_scumm_subtitle_o_tr);
break;
case FontScummRoman:
u8g2_SetFont(&canvas->fb, u8g2_font_lucasarts_scumm_subtitle_r_tr);
break;
case FontEurocorp: case FontEurocorp:
u8g2_SetFont(&canvas->fb, u8g2_font_eurocorp_tr); u8g2_SetFont(&canvas->fb, u8g2_font_eurocorp_tr);
break; break;

4
applications/services/gui/canvas.h
View File

@@ -21,8 +21,6 @@ typedef enum {
} Color; } Color;
/** Provide defines to permit checking if new are fonts available*/ /** Provide defines to permit checking if new are fonts available*/
#define CANVAS_HAS_FONT_SCUMM_ROMAN_OUTLINE = 1
#define CANVAS_HAS_FONT_SCUMM_ROMAN = 1
#define CANVAS_HAS_FONT_EUROCORP = 1 #define CANVAS_HAS_FONT_EUROCORP = 1
/** Fonts enumeration */ /** Fonts enumeration */
@@ -32,8 +30,6 @@ typedef enum {
FontKeyboard, FontKeyboard,
FontBigNumbers, FontBigNumbers,
FontBatteryPercent, FontBatteryPercent,
FontScummRomanOutline,
FontScummRoman,
FontEurocorp, FontEurocorp,
// Keep last for fonts number calculation // Keep last for fonts number calculation