diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c index da3ab1040..1e8551f6b 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c @@ -21,7 +21,6 @@ const char* const menu_style_names[MenuStyleCount] = { "PS4", "Vertical", "C64", - "Eurocorp", "Compact", "Terminal", }; diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c index ac9928a0f..f9ff2aadb 100644 --- a/applications/services/gui/canvas.c +++ b/applications/services/gui/canvas.c @@ -13,7 +13,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}, - [FontEurocorp] = {.leading_default = 12, .leading_min = 11, .height = 16, .descender = 2}, }; Canvas* canvas_init() { @@ -197,9 +196,6 @@ void canvas_set_font(Canvas* canvas, Font font) { case FontBatteryPercent: u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tr); //u8g2_font_micro_tr); break; - case FontEurocorp: - u8g2_SetFont(&canvas->fb, u8g2_font_eurocorp_tr); - break; default: furi_crash(); break; diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h index f3a398fb2..e4c8d4ea8 100644 --- a/applications/services/gui/canvas.h +++ b/applications/services/gui/canvas.h @@ -20,9 +20,6 @@ typedef enum { ColorXOR = 0x02, } Color; -/** Provide defines to permit checking if new are fonts available*/ -#define CANVAS_HAS_FONT_EUROCORP = 1 - /** Fonts enumeration */ typedef enum { FontPrimary, @@ -30,7 +27,6 @@ typedef enum { FontKeyboard, FontBigNumbers, FontBatteryPercent, - FontEurocorp, // Keep last for fonts number calculation FontTotalNumber, diff --git a/applications/services/gui/modules/menu.c b/applications/services/gui/modules/menu.c index 20cbcf326..99a589d2d 100644 --- a/applications/services/gui/modules/menu.c +++ b/applications/services/gui/modules/menu.c @@ -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( Canvas* canvas, MenuItem* item, @@ -325,36 +316,6 @@ static void menu_draw_callback(Canvas* canvas, void* _model) { 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: { size_t index; size_t y_off, x_off; @@ -653,7 +614,6 @@ static void menu_process_up(Menu* menu) { switch(xtreme_settings.menu_style) { case MenuStyleList: - case MenuStyleEurocorp: case MenuStyleTerminal: if(position > 0) { position--; @@ -705,7 +665,6 @@ static void menu_process_down(Menu* menu) { switch(xtreme_settings.menu_style) { case MenuStyleList: - case MenuStyleEurocorp: case MenuStyleTerminal: if(position < count - 1) { position++; diff --git a/lib/xtreme/xtreme.h b/lib/xtreme/xtreme.h index 458f0e9a2..663cdb47f 100644 --- a/lib/xtreme/xtreme.h +++ b/lib/xtreme/xtreme.h @@ -34,7 +34,6 @@ typedef enum { MenuStylePs4, MenuStyleVertical, MenuStyleC64, - MenuStyleEurocorp, MenuStyleCompact, MenuStyleTerminal, MenuStyleCount,