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

[FL-3729, FL-3730] Gui: fix string width calculation (#3305)

Browse Source
This commit is contained in:
あく 2023-12-21 16:43:11 +00:00 committed by GitHub
parent 17b122990f
commit 1543170f4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,10 +321,10 @@ static void canvas_draw_u8g2_bitmap_int(
void canvas_draw_u8g2_bitmap( void canvas_draw_u8g2_bitmap(
u8g2_t* u8g2, u8g2_t* u8g2,
u8g2_uint_t x, uint8_t x,
u8g2_uint_t y, uint8_t y,
u8g2_uint_t w, uint8_t w,
u8g2_uint_t h, uint8_t h,
const uint8_t* bitmap, const uint8_t* bitmap,
IconRotation rotation) { IconRotation rotation) {
u8g2_uint_t blen; u8g2_uint_t blen;

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

@ -96,4 +96,4 @@ void canvas_draw_u8g2_bitmap(
uint8_t width, uint8_t width,
uint8_t height, uint8_t height,
const uint8_t* bitmap, const uint8_t* bitmap,
uint8_t rotation); IconRotation rotation);

2
lib/u8g2/u8g2.h
View File

@ -67,7 +67,7 @@
Use 16 Bit mode for any display with more than 240 pixel in one Use 16 Bit mode for any display with more than 240 pixel in one
direction. direction.
*/ */
//#define U8G2_16BIT #define U8G2_16BIT
/* /*
The following macro switches the library into dynamic display buffer allocation mode. The following macro switches the library into dynamic display buffer allocation mode.