From 676eab29f23f169ffbd6af841c89028d960f6dd4 Mon Sep 17 00:00:00 2001 From: RebornedBrain Date: Fri, 11 Oct 2024 22:49:40 +0300 Subject: [PATCH] Function renamed accroding to review suggestions --- applications/services/gui/canvas.c | 5 +++-- applications/services/gui/canvas.h | 7 +++++-- targets/f7/api_symbols.csv | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c index b310c9318..5c297b681 100644 --- a/applications/services/gui/canvas.c +++ b/applications/services/gui/canvas.c @@ -517,17 +517,18 @@ void canvas_draw_xbm( canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap, IconRotation0); } -void canvas_draw_xbm_mirrored( +void canvas_draw_xbm_custom( Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height, + IconRotation rotation, const uint8_t* bitmap_data) { furi_check(canvas); x += canvas->offset_x; y += canvas->offset_y; - canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap_data, IconRotation180); + canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap_data, rotation); } void canvas_draw_glyph(Canvas* canvas, int32_t x, int32_t y, uint16_t ch) { diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h index be8334904..1805312fa 100644 --- a/applications/services/gui/canvas.h +++ b/applications/services/gui/canvas.h @@ -287,21 +287,24 @@ void canvas_draw_xbm( size_t height, const uint8_t* bitmap); -/** Draw mirrored XBM bitmap +/** Draw rotated XBM bitmap * * @param canvas Canvas instance * @param x x coordinate * @param y y coordinate * @param[in] width bitmap width * @param[in] height bitmap height + * @param[in] rotation bitmap rotation * @param bitmap pointer to XBM bitmap data */ -void canvas_draw_xbm_mirrored( + +void canvas_draw_xbm_custom( Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height, + IconRotation rotation, const uint8_t* bitmap_data); /** Draw dot at x,y diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index ca74ece8a..c88e85fbe 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,75.3,, +Version,+,77.0,, 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_keys_storage.h,, @@ -823,7 +823,7 @@ Function,+,canvas_draw_str,void,"Canvas*, int32_t, int32_t, const char*" Function,+,canvas_draw_str_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*" Function,+,canvas_draw_triangle,void,"Canvas*, int32_t, int32_t, size_t, size_t, CanvasDirection" Function,+,canvas_draw_xbm,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*" -Function,+,canvas_draw_xbm_mirrored,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*" +Function,+,canvas_draw_xbm_custom,void,"Canvas*, int32_t, int32_t, size_t, size_t, IconRotation, const uint8_t*" Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font" Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t" Function,+,canvas_height,size_t,const Canvas*