Remove Eurocorp font/mainmenu, -4k DFU

This commit is contained in:
Willy-JL
2024-02-12 22:27:14 +00:00
parent 88d51a31f0
commit 90111a2aa7
5 changed files with 0 additions and 51 deletions

View File

@@ -21,7 +21,6 @@ const char* const menu_style_names[MenuStyleCount] = {
"PS4", "PS4",
"Vertical", "Vertical",
"C64", "C64",
"Eurocorp",
"Compact", "Compact",
"Terminal", "Terminal",
}; };

View File

@@ -13,7 +13,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},
[FontEurocorp] = {.leading_default = 12, .leading_min = 11, .height = 16, .descender = 2},
}; };
Canvas* canvas_init() { Canvas* canvas_init() {
@@ -197,9 +196,6 @@ void canvas_set_font(Canvas* canvas, Font font) {
case FontBatteryPercent: case FontBatteryPercent:
u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tr); //u8g2_font_micro_tr); u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tr); //u8g2_font_micro_tr);
break; break;
case FontEurocorp:
u8g2_SetFont(&canvas->fb, u8g2_font_eurocorp_tr);
break;
default: default:
furi_crash(); furi_crash();
break; break;

View File

@@ -20,9 +20,6 @@ typedef enum {
ColorXOR = 0x02, ColorXOR = 0x02,
} Color; } Color;
/** Provide defines to permit checking if new are fonts available*/
#define CANVAS_HAS_FONT_EUROCORP = 1
/** Fonts enumeration */ /** Fonts enumeration */
typedef enum { typedef enum {
FontPrimary, FontPrimary,
@@ -30,7 +27,6 @@ typedef enum {
FontKeyboard, FontKeyboard,
FontBigNumbers, FontBigNumbers,
FontBatteryPercent, FontBatteryPercent,
FontEurocorp,
// Keep last for fonts number calculation // Keep last for fonts number calculation
FontTotalNumber, FontTotalNumber,

View File

@@ -54,15 +54,6 @@ static void menu_short_name(MenuItem* item, FuriString* name) {
} }
} }
static void menu_string_to_upper_case(FuriString* str) {
for(size_t i = 0; i < furi_string_size(str); i++) {
char c = furi_string_get_char(str, i);
if(c >= 'a' && c <= 'z') {
furi_string_set_char(str, i, c - 'a' + 'A');
}
}
}
static void menu_centered_icon( static void menu_centered_icon(
Canvas* canvas, Canvas* canvas,
MenuItem* item, MenuItem* item,
@@ -325,36 +316,6 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
break; break;
} }
case MenuStyleEurocorp: {
#ifdef CANVAS_HAS_FONT_EUROCORP
canvas_set_font(canvas, FontEurocorp);
#else
canvas_set_font(canvas, FontPrimary);
#endif
for(uint8_t i = 0; i < 3; i++) {
canvas_set_color(canvas, ColorBlack);
shift_position = (position + items_count + i - 1) % items_count;
item = MenuItemArray_get(model->items, shift_position);
menu_short_name(item, name);
menu_string_to_upper_case(name);
size_t scroll_counter = menu_scroll_counter(model, i == 1);
if(i == 1) {
canvas_draw_box(canvas, 0, 22, 128, 22);
canvas_set_color(canvas, ColorWhite);
// Clip corner
for(uint8_t i = 0; i < 6; i++) {
for(uint8_t j = 0; j < 6; j++) {
if(j - i >= 0) {
canvas_draw_dot(canvas, 128 - i, 22 + j - i);
}
}
}
}
elements_scrollable_text_line(
canvas, 2, 19 + 22 * i, 128 - 3, name, scroll_counter, false);
}
break;
}
case MenuStyleCompact: { case MenuStyleCompact: {
size_t index; size_t index;
size_t y_off, x_off; size_t y_off, x_off;
@@ -653,7 +614,6 @@ static void menu_process_up(Menu* menu) {
switch(xtreme_settings.menu_style) { switch(xtreme_settings.menu_style) {
case MenuStyleList: case MenuStyleList:
case MenuStyleEurocorp:
case MenuStyleTerminal: case MenuStyleTerminal:
if(position > 0) { if(position > 0) {
position--; position--;
@@ -705,7 +665,6 @@ static void menu_process_down(Menu* menu) {
switch(xtreme_settings.menu_style) { switch(xtreme_settings.menu_style) {
case MenuStyleList: case MenuStyleList:
case MenuStyleEurocorp:
case MenuStyleTerminal: case MenuStyleTerminal:
if(position < count - 1) { if(position < count - 1) {
position++; position++;

View File

@@ -34,7 +34,6 @@ typedef enum {
MenuStylePs4, MenuStylePs4,
MenuStyleVertical, MenuStyleVertical,
MenuStyleC64, MenuStyleC64,
MenuStyleEurocorp,
MenuStyleCompact, MenuStyleCompact,
MenuStyleTerminal, MenuStyleTerminal,
MenuStyleCount, MenuStyleCount,