looks nicer

pull/35545/head
Shane Smiskol 6 days ago
parent f3e3ac0d6c
commit 8f36c92675
  1. 2
      selfdrive/ui/layouts/home.py
  2. 2
      selfdrive/ui/layouts/main.py
  3. 4
      system/ui/lib/list_view.py
  4. 4
      system/ui/lib/widget.py

@ -83,7 +83,7 @@ class HomeLayout(Widget):
elif self.current_state == HomeLayoutState.ALERTS: elif self.current_state == HomeLayoutState.ALERTS:
self._render_alerts_view() self._render_alerts_view()
def _update_layout_rects(self): def _update_layout(self):
self.header_rect = rl.Rectangle( self.header_rect = rl.Rectangle(
self._rect.x + CONTENT_MARGIN, self._rect.y + CONTENT_MARGIN, self._rect.width - 2 * CONTENT_MARGIN, HEADER_HEIGHT self._rect.x + CONTENT_MARGIN, self._rect.y + CONTENT_MARGIN, self._rect.width - 2 * CONTENT_MARGIN, HEADER_HEIGHT
) )

@ -41,7 +41,7 @@ class MainLayout(Widget):
self._layouts[MainState.SETTINGS].set_callbacks(on_close=self._set_mode_for_state) self._layouts[MainState.SETTINGS].set_callbacks(on_close=self._set_mode_for_state)
self._layouts[MainState.ONROAD].set_callbacks(on_click=self._on_onroad_clicked) self._layouts[MainState.ONROAD].set_callbacks(on_click=self._on_onroad_clicked)
def _update_layout_rects(self): def _update_layout(self):
self._sidebar_rect = rl.Rectangle(self._rect.x, self._rect.y, SIDEBAR_WIDTH, self._rect.height) self._sidebar_rect = rl.Rectangle(self._rect.x, self._rect.y, SIDEBAR_WIDTH, self._rect.height)
x_offset = SIDEBAR_WIDTH if self._sidebar.is_visible else 0 x_offset = SIDEBAR_WIDTH if self._sidebar.is_visible else 0

@ -275,7 +275,7 @@ class ListView(Widget):
self._total_height = 0 self._total_height = 0
def _render(self, rect: rl.Rectangle): def _render(self, rect: rl.Rectangle):
self._update_layout_rects() self._update_layout()
# Update layout and handle scrolling # Update layout and handle scrolling
content_rect = rl.Rectangle(rect.x, rect.y, rect.width, self._total_height) content_rect = rl.Rectangle(rect.x, rect.y, rect.width, self._total_height)
@ -318,7 +318,7 @@ class ListView(Widget):
return i return i
return None return None
def _update_layout_rects(self): def _update_layout(self):
current_y = 0.0 current_y = 0.0
for item in self._items: for item in self._items:
if not item.is_visible: if not item.is_visible:

@ -28,7 +28,7 @@ class Widget(abc.ABC):
self._rect = rect self._rect = rect
if (rect.x != prev_rect.x or rect.y != prev_rect.y or if (rect.x != prev_rect.x or rect.y != prev_rect.y or
rect.width != prev_rect.width or rect.height != prev_rect.height): rect.width != prev_rect.width or rect.height != prev_rect.height):
self._update_layout_rects() self._update_layout()
def render(self, rect: rl.Rectangle = None) -> bool | int | None: def render(self, rect: rl.Rectangle = None) -> bool | int | None:
if rect is not None: if rect is not None:
@ -56,7 +56,7 @@ class Widget(abc.ABC):
def _render(self, rect: rl.Rectangle) -> bool | int | None: def _render(self, rect: rl.Rectangle) -> bool | int | None:
"""Render the widget within the given rectangle.""" """Render the widget within the given rectangle."""
def _update_layout_rects(self) -> None: def _update_layout(self) -> None:
"""Optionally update any layout rects on Widget rect change.""" """Optionally update any layout rects on Widget rect change."""
def _handle_mouse_release(self, mouse_pos: rl.Vector2) -> bool: def _handle_mouse_release(self, mouse_pos: rl.Vector2) -> bool:

Loading…
Cancel
Save