post merge fix

applications/services/gui/canvas.c

@@ -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) {

applications/services/gui/canvas.h

@@ -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
  *

targets/f7/api_symbols.csv

@@ -789,6 +789,7 @@ Function,+,calloc,void*,"size_t, size_t"
 Function,+,canvas_clear,void,Canvas*
 Function,+,canvas_commit,void,Canvas*
 Function,+,canvas_current_font_height,size_t,const Canvas*
+Function,+,canvas_current_font_width,size_t,const Canvas*
 Function,+,canvas_draw_bitmap,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
 Function,+,canvas_draw_box,void,"Canvas*, int32_t, int32_t, size_t, size_t"
 Function,+,canvas_draw_circle,void,"Canvas*, int32_t, int32_t, size_t"
@@ -798,6 +799,7 @@ Function,+,canvas_draw_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
 Function,+,canvas_draw_glyph,void,"Canvas*, int32_t, int32_t, uint16_t"
 Function,+,canvas_draw_icon,void,"Canvas*, int32_t, int32_t, const Icon*"
 Function,+,canvas_draw_icon_animation,void,"Canvas*, int32_t, int32_t, IconAnimation*"
+Function,+,canvas_draw_icon_bitmap,void,"Canvas*, uint8_t, uint8_t, int16_t, int16_t, const Icon*"
 Function,+,canvas_draw_icon_ex,void,"Canvas*, int32_t, int32_t, const Icon*, IconRotation"
 Function,+,canvas_draw_line,void,"Canvas*, int32_t, int32_t, int32_t, int32_t"
 Function,+,canvas_draw_rbox,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"