From 0241d8d1e8d4f5ec3825ee5ed7c878827190ec1c Mon Sep 17 00:00:00 2001 From: RebornedBrain Date: Mon, 14 Oct 2024 18:30:50 +0300 Subject: [PATCH 1/2] Rename #2 --- applications/services/gui/canvas.c | 6 ++---- applications/services/gui/canvas.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c index 5c297b681..47e4c7d3d 100644 --- a/applications/services/gui/canvas.c +++ b/applications/services/gui/canvas.c @@ -512,12 +512,10 @@ void canvas_draw_xbm( size_t height, const uint8_t* bitmap) { furi_check(canvas); - x += canvas->offset_x; - y += canvas->offset_y; - canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap, IconRotation0); + canvas_draw_xbm_ex(canvas, x, y, width, height, IconRotation0, bitmap); } -void canvas_draw_xbm_custom( +void canvas_draw_xbm_ex( Canvas* canvas, int32_t x, int32_t y, diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h index 1805312fa..308d17fc3 100644 --- a/applications/services/gui/canvas.h +++ b/applications/services/gui/canvas.h @@ -298,7 +298,7 @@ void canvas_draw_xbm( * @param bitmap pointer to XBM bitmap data */ -void canvas_draw_xbm_custom( +void canvas_draw_xbm_ex( Canvas* canvas, int32_t x, int32_t y, From 9839db70f5f44260a497067e1cfc45e11b0bb2be Mon Sep 17 00:00:00 2001 From: RebornedBrain Date: Mon, 14 Oct 2024 18:31:48 +0300 Subject: [PATCH 2/2] Api adjustements --- targets/f18/api_symbols.csv | 3 ++- targets/f7/api_symbols.csv | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index 1d9ac2869..417c9656d 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,74.0,, +Version,+,78.0,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, Header,+,applications/services/cli/cli.h,, @@ -746,6 +746,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_ex,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* diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index c88e85fbe..b9732de59 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,77.0,, +Version,+,78.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_custom,void,"Canvas*, int32_t, int32_t, size_t, size_t, IconRotation, const uint8_t*" +Function,+,canvas_draw_xbm_ex,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*