spinner vertical alignment

system/ui/spinner.py

@@ -6,14 +6,17 @@ import threading
 from openpilot.common.basedir import BASEDIR
 from openpilot.system.ui.lib.wrapper import Wrapper
 from openpilot.system.ui.lib.application import gui_app
+from openpilot.system.ui.text import wrap_text
 
 # Constants
 PROGRESS_BAR_WIDTH = 1000
 PROGRESS_BAR_HEIGHT = 20
 ROTATION_TIME_SECONDS = 1.0  # Time for one full circle
-MARGIN = 200
+MARGIN_H = 50
+MARGIN_V = 200
 TEXTURE_SIZE = 360
 FONT_SIZE = 96
+LINE_HEIGHT = 104
 DARKGRAY = (55, 55, 55, 255)
 
 
@@ -26,48 +29,56 @@ class SpinnerRenderer:
     self._comma_texture = gui_app.load_texture_from_image(os.path.join(BASEDIR, "selfdrive/assets/img_spinner_comma.png"), TEXTURE_SIZE, TEXTURE_SIZE)
     self._spinner_texture = gui_app.load_texture_from_image(os.path.join(BASEDIR, "selfdrive/assets/img_spinner_track.png"), TEXTURE_SIZE, TEXTURE_SIZE)
     self._rotation = 0.0
-    self._text: str = ""
+    self._progress: int | None = 0
+    self._wrapped_lines = []
     self._lock = threading.Lock()
 
   def set_text(self, text: str) -> None:
     with self._lock:
-      self._text = text
+      if text.isdigit():
+        self._progress = clamp(int(text), 0, 100)
+        self._wrapped_lines = []
+      else:
+        self._progress = None
+        self._wrapped_lines = wrap_text(text, FONT_SIZE, gui_app.width - MARGIN_H * 2)
 
   def render(self):
     center = rl.Vector2(gui_app.width / 2.0, gui_app.height / 2.0)
-    spinner_origin = rl.Vector2(TEXTURE_SIZE / 2.0, TEXTURE_SIZE / 2.0)
-    comma_position = rl.Vector2(center.x - TEXTURE_SIZE / 2.0, center.y - TEXTURE_SIZE / 2.0)
 
+    # Display progress bar or text based on user input
+    with self._lock:
+      progress = self._progress
+      wrapped_lines = self._wrapped_lines.copy()
+
+    if progress is not None:
+      y_pos = rl.get_screen_height() - MARGIN_V - PROGRESS_BAR_HEIGHT
+      bar = rl.Rectangle(center.x - PROGRESS_BAR_WIDTH / 2.0, y_pos, PROGRESS_BAR_WIDTH, PROGRESS_BAR_HEIGHT)
+      rl.draw_rectangle_rounded(bar, 1, 10, DARKGRAY)
+
+      bar.width *= progress / 100.0
+      rl.draw_rectangle_rounded(bar, 1, 10, rl.WHITE)
+    else:
+      center.y -= MARGIN_V
+      y_pos = center.y + TEXTURE_SIZE / 2 + MARGIN_V / 2
+      for i, line in enumerate(wrapped_lines):
+        text_size = rl.measure_text_ex(gui_app.font(), line, FONT_SIZE, 1.0)
+        rl.draw_text_ex(gui_app.font(), line, rl.Vector2(center.x - text_size.x / 2, y_pos + i * LINE_HEIGHT),
+                        FONT_SIZE, 1.0, rl.WHITE)
+
+    # Draw rotating spinner and static comma logo
     fps = rl.get_fps()
     if fps > 0:
       degrees_per_frame = 360.0 / (ROTATION_TIME_SECONDS * fps)
       self._rotation = (self._rotation + degrees_per_frame) % 360.0
 
-    # Draw rotating spinner and static comma logo
+    spinner_origin = rl.Vector2(TEXTURE_SIZE / 2.0, TEXTURE_SIZE / 2.0)
+    comma_position = rl.Vector2(center.x - TEXTURE_SIZE / 2.0, center.y - TEXTURE_SIZE / 2.0)
+
     rl.draw_texture_pro(self._spinner_texture, rl.Rectangle(0, 0, TEXTURE_SIZE, TEXTURE_SIZE),
                         rl.Rectangle(center.x, center.y, TEXTURE_SIZE, TEXTURE_SIZE),
                         spinner_origin, self._rotation, rl.WHITE)
     rl.draw_texture_v(self._comma_texture, comma_position, rl.WHITE)
 
-    # Display progress bar or text based on user input
-    text = None
-    with self._lock:
-      text = self._text
-
-    if text:
-      y_pos = rl.get_screen_height() - MARGIN - PROGRESS_BAR_HEIGHT
-      if text.isdigit():
-        progress = clamp(int(text), 0, 100)
-        bar = rl.Rectangle(center.x - PROGRESS_BAR_WIDTH / 2.0, y_pos, PROGRESS_BAR_WIDTH, PROGRESS_BAR_HEIGHT)
-        rl.draw_rectangle_rounded(bar, 1, 10, DARKGRAY)
-
-        bar.width *= progress / 100.0
-        rl.draw_rectangle_rounded(bar, 1, 10, rl.WHITE)
-      else:
-        text_size = rl.measure_text_ex(gui_app.font(), text, FONT_SIZE, 1.0)
-        rl.draw_text_ex(gui_app.font(), text,
-                        rl.Vector2(center.x - text_size.x / 2, y_pos), FONT_SIZE, 1.0, rl.WHITE)
-
 
 class Spinner(Wrapper):
   def __init__(self):