use default font for _font_size

Author: jblanked

src/MicroPython/picoware/gui/draw.py

@@ -10,7 +10,7 @@
 # Waveshare LCD imports
 try:
     from waveshare_lcd import (
-        get_font_size as waveshare_get_font_size,
+        FONT_DEFAULT,
         fill_screen as waveshare_fill_screen,
         draw_line,
         draw_rect as waveshare_draw_rect,
@@ -35,8 +35,7 @@
         deinit,
         init,
         clear_framebuffer,
-        CHAR_WIDTH,
-        FONT_HEIGHT,
+        FONT_DEFAULT,
         draw_circle,
         fill_circle,
         fill_rect,
@@ -61,13 +60,16 @@ class Draw:
     def __init__(
         self, foreground: int = TFT_WHITE, background: int = TFT_BLACK, mode: int = 0
     ) -> None:
+        from picoware.system.font import FontSize
+
         self._current_board_id = BOARD_ID
 
         self._background = background
         self._foreground = foreground
 
         self._size = Vector(0, 0)
-        self._font_size = Vector(0, 0)
+        default_font = FontSize(FONT_DEFAULT)
+        self._font_size = Vector(default_font.width, default_font.height)
 
         self._use_lvgl = False
 
@@ -76,31 +78,25 @@ def __init__(
 
             # Initialize native LCD extension
             init(True)
-            self._font_size.x, self._font_size.y = waveshare_get_font_size()
 
         elif self._current_board_id == BOARD_WAVESHARE_1_43_RP2350:
             self._size.x, self._size.y = 466, 466
 
             # Initialize native LCD extension
             init()
-            self._font_size.x, self._font_size.y = waveshare_get_font_size()
 
         elif self._current_board_id == BOARD_WAVESHARE_3_49_RP2350:
             self._size.x, self._size.y = 172, 640
 
             # Initialize native LCD extension
             init()
-            self._font_size.x, self._font_size.y = waveshare_get_font_size()
 
         else:  # PicoCalc
             self._size.x, self._size.y = 320, 320
 
             # Initialize native LCD extension
             init(background, mode)
 
-            self._font_size.x = CHAR_WIDTH
-            self._font_size.y = FONT_HEIGHT
-
             # Clear the display and framebuffer
             clear_framebuffer(self._rgb565_to_rgb332(background))