libs/m5ui: Fix screen size retrieval in emulator.

Signed-off-by: tinyu <[email protected]>

Author: Tinyu-Zhao

m5stack/libs/m5ui/base.py

@@ -105,22 +105,6 @@ def set_bg_color(self, color: int, opa: int, part: int) -> None:
         time.sleep(0.01)
         self.set_style_bg_opa(opa, part)
 
-    @staticmethod
-    def set_line_color(self, color: int, opa: int, part: int = lv.PART.MAIN) -> None:
-        """Set the line color and opacity for a given part of the object.
-
-        :param int color: The color to set, can be an integer (hex) or a lv.color object.
-        :param int opa: The opacity level (0-255).
-        :param int part: The part of the object to apply the style to (e.g., lv.PART.MAIN).
-        :return: None
-        """
-        if isinstance(color, int):
-            color = lv.color_hex(color)
-
-        self.set_style_line_color(color, part)
-        time.sleep(0.01)
-        self.set_style_line_opa(opa, part)
-
     @staticmethod
     def set_bg_grad_color(self, color, opa, grad_color, grad_opd, grad_dir, part: int) -> None:
         """Set the background gradient color of the bar.
@@ -168,3 +152,13 @@ def set_border_color(self, color: int, opa: int, part: int):
         self.set_style_border_color(color, part)
         time.sleep(0.01)
         self.set_style_border_opa(opa, part)
+
+    @staticmethod
+    def get_display_size(self):
+        """Get the display size.
+
+        :return: A tuple containing the width and height of the display.
+        :rtype: tuple
+        """
+        scr = lv.screen_active()
+        return scr.get_width(), scr.get_height()

m5stack/libs/m5ui/switch.py

@@ -4,7 +4,6 @@
 
 from m5ui.base import M5Base
 import lvgl as lv
-import M5
 
 
 class M5Switch(lv.switch):
@@ -49,12 +48,12 @@ def __init__(
             parent = lv.screen_active()
         super().__init__(parent)
         self.set_pos(x, y)
-        self.set_bg_color(bg_c, 255, lv.PART.MAIN | lv.STATE.DEFAULT)
-        self.set_bg_color(bg_c_checked, 255, lv.PART.INDICATOR | lv.STATE.CHECKED)
-        self.set_bg_color(circle_c, 255, lv.PART.KNOB | lv.STATE.DEFAULT)
         self.set_size(w, h)
         self.width = w
         self.height = h
+        self.set_bg_color(bg_c, 255, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.set_bg_color(bg_c_checked, 255, lv.PART.INDICATOR | lv.STATE.CHECKED)
+        self.set_bg_color(circle_c, 255, lv.PART.KNOB | lv.STATE.DEFAULT)
 
     def set_direction(self, direction):
         """Set the direction of the switch.
@@ -89,13 +88,13 @@ def set_size(self, w, h):
         if w < 0 or h < 0:
             raise ValueError("Width and height must be non-negative")
 
-        _width = M5.Display.width()
-        _height = M5.Display.height()
+        _width, _height = self.get_display_size()
 
         if w < _width and h < _height:
             super().set_size(w, h)
         else:
             print("Warning: width or height exceed screen size, auto set to screen size")
+            self.set_pos(0, 0)
             super().set_size(_width, _height)
 
         self.width = w