From 1543170f4cfa4ef23616c7a3d83704107e703919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=81=8F?= <alleteam@gmail.com>
Date: Thu, 21 Dec 2023 16:43:11 +0000
Subject: [PATCH] [FL-3729, FL-3730] Gui: fix string width calculation (#3305)

---
 applications/services/gui/canvas.c   | 8 ++++----
 applications/services/gui/canvas_i.h | 2 +-
 lib/u8g2/u8g2.h                      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c
index 209c82a82f..c7e7dc3557 100644
--- a/applications/services/gui/canvas.c
+++ b/applications/services/gui/canvas.c
@@ -321,10 +321,10 @@ static void canvas_draw_u8g2_bitmap_int(
 
 void canvas_draw_u8g2_bitmap(
     u8g2_t* u8g2,
-    u8g2_uint_t x,
-    u8g2_uint_t y,
-    u8g2_uint_t w,
-    u8g2_uint_t h,
+    uint8_t x,
+    uint8_t y,
+    uint8_t w,
+    uint8_t h,
     const uint8_t* bitmap,
     IconRotation rotation) {
     u8g2_uint_t blen;
diff --git a/applications/services/gui/canvas_i.h b/applications/services/gui/canvas_i.h
index f3b8f17ad7..5f7d69e727 100644
--- a/applications/services/gui/canvas_i.h
+++ b/applications/services/gui/canvas_i.h
@@ -96,4 +96,4 @@ void canvas_draw_u8g2_bitmap(
     uint8_t width,
     uint8_t height,
     const uint8_t* bitmap,
-    uint8_t rotation);
+    IconRotation rotation);
diff --git a/lib/u8g2/u8g2.h b/lib/u8g2/u8g2.h
index 68611d4827..540b7a8738 100644
--- a/lib/u8g2/u8g2.h
+++ b/lib/u8g2/u8g2.h
@@ -67,7 +67,7 @@
   Use 16 Bit mode for any display with more than 240 pixel in one 
   direction.
 */
-//#define U8G2_16BIT
+#define U8G2_16BIT
 
 /*
   The following macro switches the library into dynamic display buffer allocation mode.