mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allows you to use UCS-2 in canvas_glyph_width (#3226)

Browse Source 
* allows you to use UCS-2 in canvas_glyph_width
* Sync API Symbols

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Evgeny Stepanischev 2023-11-30 12:38:48 +03:00 committed by GitHub
parent f9101d8084
commit ff129e524a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,7 @@ uint16_t canvas_string_width(Canvas* canvas, const char* str) {
return u8g2_GetStrWidth(&canvas->fb, str); return u8g2_GetStrWidth(&canvas->fb, str);
} }
uint8_t canvas_glyph_width(Canvas* canvas, char symbol) { uint8_t canvas_glyph_width(Canvas* canvas, uint16_t symbol) {
furi_assert(canvas); furi_assert(canvas);
return u8g2_GetGlyphWidth(&canvas->fb, symbol); return u8g2_GetGlyphWidth(&canvas->fb, symbol);
} }

2
applications/services/gui/canvas.h
View File

@ -214,7 +214,7 @@ uint16_t canvas_string_width(Canvas* canvas, const char* str);
* *
* @return width in pixels * @return width in pixels
*/ */
uint8_t canvas_glyph_width(Canvas* canvas, char symbol); uint8_t canvas_glyph_width(Canvas* canvas, uint16_t symbol);
/** Draw bitmap picture at position defined by x,y. /** Draw bitmap picture at position defined by x,y.
* *

4
targets/f18/api_symbols.csv
View File

@ -1,5 +1,5 @@
entry,status,name,type,params entry,status,name,type,params
Version,+,46.0,, Version,+,47.0,,
Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,, Header,+,applications/services/cli/cli_vcp.h,,
@ -633,7 +633,7 @@ Function,+,canvas_draw_str_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align
Function,+,canvas_draw_triangle,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection" Function,+,canvas_draw_triangle,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection"
Function,+,canvas_draw_xbm,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*" Function,+,canvas_draw_xbm,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*"
Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font" Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font"
Function,+,canvas_glyph_width,uint8_t,"Canvas*, char" Function,+,canvas_glyph_width,uint8_t,"Canvas*, uint16_t"
Function,+,canvas_height,uint8_t,const Canvas* Function,+,canvas_height,uint8_t,const Canvas*
Function,+,canvas_invert_color,void,Canvas* Function,+,canvas_invert_color,void,Canvas*
Function,+,canvas_reset,void,Canvas* Function,+,canvas_reset,void,Canvas*

1 entry status name type params
2 Version + 46.0 47.0
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h
633 Function + canvas_draw_triangle void Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection
634 Function + canvas_draw_xbm void Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*
635 Function + canvas_get_font_params const CanvasFontParameters* const Canvas*, Font
636 Function + canvas_glyph_width uint8_t Canvas*, char Canvas*, uint16_t
637 Function + canvas_height uint8_t const Canvas*
638 Function + canvas_invert_color void Canvas*
639 Function + canvas_reset void Canvas*

4
targets/f7/api_symbols.csv
View File

@ -1,5 +1,5 @@
entry,status,name,type,params entry,status,name,type,params
Version,+,46.0,, Version,+,47.0,,
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli.h,,
@ -722,7 +722,7 @@ Function,+,canvas_draw_str_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align
Function,+,canvas_draw_triangle,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection" Function,+,canvas_draw_triangle,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection"
Function,+,canvas_draw_xbm,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*" Function,+,canvas_draw_xbm,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*"
Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font" Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font"
Function,+,canvas_glyph_width,uint8_t,"Canvas*, char" Function,+,canvas_glyph_width,uint8_t,"Canvas*, uint16_t"
Function,+,canvas_height,uint8_t,const Canvas* Function,+,canvas_height,uint8_t,const Canvas*
Function,+,canvas_invert_color,void,Canvas* Function,+,canvas_invert_color,void,Canvas*
Function,+,canvas_reset,void,Canvas* Function,+,canvas_reset,void,Canvas*

1 entry status name type params
2 Version + 46.0 47.0
3 Header + applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h
4 Header + applications/services/bt/bt_service/bt.h
5 Header + applications/services/cli/cli.h
722 Function + canvas_draw_triangle void Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, CanvasDirection
723 Function + canvas_draw_xbm void Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*
724 Function + canvas_get_font_params const CanvasFontParameters* const Canvas*, Font
725 Function + canvas_glyph_width uint8_t Canvas*, char Canvas*, uint16_t
726 Function + canvas_height uint8_t const Canvas*
727 Function + canvas_invert_color void Canvas*
728 Function + canvas_reset void Canvas*