From 92b44c43510c45c555f5615ae96fbca019f00b34 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:00:57 +0000 Subject: [PATCH] Remove scumm roman font from fw flash --nobuild --- applications/external | 2 +- applications/services/gui/canvas.c | 9 --------- applications/services/gui/canvas.h | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/applications/external b/applications/external index b29a5871c..26906fdec 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit b29a5871ca14ad49887bba7701b4534385172fa5 +Subproject commit 26906fdec251102896e07bb7d7acf69d443fe6a8 diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c index 4bb2ae87f..24e994621 100644 --- a/applications/services/gui/canvas.c +++ b/applications/services/gui/canvas.c @@ -14,9 +14,6 @@ const CanvasFontParameters canvas_font_params[FontTotalNumber] = { [FontKeyboard] = {.leading_default = 11, .leading_min = 9, .height = 7, .descender = 2}, [FontBigNumbers] = {.leading_default = 18, .leading_min = 16, .height = 15, .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}, }; @@ -201,12 +198,6 @@ void canvas_set_font(Canvas* canvas, Font font) { case FontBatteryPercent: u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tf); //u8g2_font_micro_tr); 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: u8g2_SetFont(&canvas->fb, u8g2_font_eurocorp_tr); break; diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h index 6cb4cd633..828196e82 100644 --- a/applications/services/gui/canvas.h +++ b/applications/services/gui/canvas.h @@ -21,8 +21,6 @@ typedef enum { } Color; /** 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 /** Fonts enumeration */ @@ -32,8 +30,6 @@ typedef enum { FontKeyboard, FontBigNumbers, FontBatteryPercent, - FontScummRomanOutline, - FontScummRoman, FontEurocorp, // Keep last for fonts number calculation