pull/35003/head
Cameron Clough 1 week ago
parent e5615679dc
commit c12244f175
  1. 4
      system/ui/spinner.py
  2. 4
      system/ui/text.py

@ -20,7 +20,7 @@ def clamp(value, min_value, max_value):
return max(min(value, max_value), min_value) return max(min(value, max_value), min_value)
class Renderer: class SpinnerRenderer:
def __init__(self): def __init__(self):
self._comma_texture = gui_app.load_texture_from_image(os.path.join(BASEDIR, "selfdrive/assets/img_spinner_comma.png"), TEXTURE_SIZE, TEXTURE_SIZE) 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._spinner_texture = gui_app.load_texture_from_image(os.path.join(BASEDIR, "selfdrive/assets/img_spinner_track.png"), TEXTURE_SIZE, TEXTURE_SIZE)
@ -70,7 +70,7 @@ class Renderer:
class Spinner(Wrapper): class Spinner(Wrapper):
def __init__(self): def __init__(self):
super().__init__("Spinner", Renderer) super().__init__("Spinner", SpinnerRenderer)
def update(self, spinner_text: str): def update(self, spinner_text: str):
if self._renderer is not None: if self._renderer is not None:

@ -32,7 +32,7 @@ def wrap_text(text, font_size, max_width):
return lines return lines
class Renderer: class TextRenderer:
def __init__(self, text: str): def __init__(self, text: str):
self._textarea_rect = rl.Rectangle(MARGIN, MARGIN, gui_app.width - MARGIN * 2, gui_app.height - MARGIN * 2) self._textarea_rect = rl.Rectangle(MARGIN, MARGIN, gui_app.width - MARGIN * 2, gui_app.height - MARGIN * 2)
self._wrapped_lines = wrap_text(text, FONT_SIZE, self._textarea_rect.width - 20) self._wrapped_lines = wrap_text(text, FONT_SIZE, self._textarea_rect.width - 20)
@ -58,7 +58,7 @@ class Renderer:
class TextWindow(Wrapper): class TextWindow(Wrapper):
def __init__(self, text: str): def __init__(self, text: str):
super().__init__("Text", Renderer, text) super().__init__("Text", TextRenderer, text)
if __name__ == "__main__": if __name__ == "__main__":

Loading…
Cancel
Save