Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added UTF-8 support to Flipper Zero canvas API #3297

Merged
merged 4 commits into from Dec 18, 2023
Merged

Added UTF-8 support to Flipper Zero canvas API #3297

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cdef47
Added UTF-8 support to Flipper Zero canvas API
bolknote Dec 16, 2023
6623e4f
Merge branch 'dev' into dev
bolknote Dec 16, 2023
cadccbb
Merge branch 'dev' into dev
skotopes Dec 18, 2023
8177363
Add unicode example
skotopes Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions applications/services/gui/canvas.c
View file
Open in desktop
Expand Up @@ -150,7 +150,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(
Expand All @@ -169,10 +169,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();
Expand All @@ -193,13 +193,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) {
Expand Down