No need for FontSwap intermediary

This commit is contained in:
Willy-JL
2024-02-12 22:34:18 +00:00
parent 90111a2aa7
commit abaa8c83ad
3 changed files with 13 additions and 22 deletions

View File

@@ -137,7 +137,7 @@ uint8_t canvas_current_font_width(const Canvas* canvas) {
const CanvasFontParameters* canvas_get_font_params(const Canvas* canvas, Font font) {
furi_assert(canvas);
furi_assert(font < FontTotalNumber);
if((FontSwap)font < FontSwapCount && xtreme_assets.font_params[font]) {
if(xtreme_assets.font_params[font]) {
return xtreme_assets.font_params[font];
}
return &canvas_font_params[font];
@@ -176,7 +176,7 @@ void canvas_invert_color(Canvas* canvas) {
void canvas_set_font(Canvas* canvas, Font font) {
furi_assert(canvas);
u8g2_SetFontMode(&canvas->fb, 1);
if((FontSwap)font < FontSwapCount && xtreme_assets.fonts[font]) {
if(xtreme_assets.fonts[font]) {
u8g2_SetFont(&canvas->fb, xtreme_assets.fonts[font]);
return;
}