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

Merge branch 'ofw_dev' into dev

Browse Source
This commit is contained in:
MX
2023-12-19 14:01:10 +03:00
parent 528d2a7ec3 25d24f1e4c
commit 14c6abe4eb
2 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,7 @@ void canvas_draw_str(Canvas* canvas, uint8_t x, uint8_t y, const char* str) {
if(!str) return;
x += canvas->offset_x;
y += canvas->offset_y;
u8g2_DrawStr(&canvas->fb, x, y, str);
u8g2_DrawUTF8(&canvas->fb, x, y, str);
}
void canvas_draw_str_aligned(
@@ -177,10 +177,10 @@ void canvas_draw_str_aligned(
case AlignLeft:
break;
case AlignRight:
x -= u8g2_GetStrWidth(&canvas->fb, str);
x -= u8g2_GetUTF8Width(&canvas->fb, str);
break;
case AlignCenter:
x -= (u8g2_GetStrWidth(&canvas->fb, str) / 2);
x -= (u8g2_GetUTF8Width(&canvas->fb, str) / 2);
break;
default:
furi_crash();
@@ -201,13 +201,13 @@ void canvas_draw_str_aligned(
break;
}
u8g2_DrawStr(&canvas->fb, x, y, str);
u8g2_DrawUTF8(&canvas->fb, x, y, str);
}
uint16_t canvas_string_width(Canvas* canvas, const char* str) {
furi_assert(canvas);
if(!str) return 0;
return u8g2_GetStrWidth(&canvas->fb, str);
return u8g2_GetUTF8Width(&canvas->fb, str);
}
uint8_t canvas_glyph_width(Canvas* canvas, uint16_t symbol) {