From 0241d8d1e8d4f5ec3825ee5ed7c878827190ec1c Mon Sep 17 00:00:00 2001 From: RebornedBrain Date: Mon, 14 Oct 2024 18:30:50 +0300 Subject: [PATCH] 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,