post merge fix

This commit is contained in:
MX
2024-03-25 14:08:51 +03:00
parent 9961dadee7
commit 01f3192957
3 changed files with 5 additions and 3 deletions

View File

@@ -128,9 +128,9 @@ size_t canvas_current_font_height(const Canvas* canvas) {
return font_height;
}
uint8_t canvas_current_font_width(const Canvas* canvas) {
size_t canvas_current_font_width(const Canvas* canvas) {
furi_assert(canvas);
return (uint8_t)u8g2_GetMaxCharWidth(&canvas->fb);
return (size_t)u8g2_GetMaxCharWidth(&canvas->fb);
}
const CanvasFontParameters* canvas_get_font_params(const Canvas* canvas, Font font) {

View File

@@ -127,7 +127,7 @@ size_t canvas_current_font_height(const Canvas* canvas);
*
* @return width in pixels.
*/
uint8_t canvas_current_font_width(const Canvas* canvas);
size_t canvas_current_font_width(const Canvas* canvas);
/** Get font parameters
*