mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-13 08:48:35 -07:00
post merge fix
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user