child widgets!

Author: sshane

system/ui/widgets/__init__.py

@@ -3,6 +3,7 @@
 import abc
 import pyray as rl
 from enum import IntEnum
+from typing import TypeVar
 from collections.abc import Callable
 from openpilot.system.ui.lib.application import gui_app, MousePos, MAX_TOUCH_SLOTS, MouseEvent
 
@@ -14,6 +15,9 @@ class Device:
   device = Device()
 
 
+W = TypeVar('W', bound='Widget')
+
+
 class DialogResult(IntEnum):
   CANCEL = 0
   CONFIRM = 1
@@ -22,6 +26,7 @@ class DialogResult(IntEnum):
 
 class Widget(abc.ABC):
   def __init__(self):
+    self._children: list[Widget] = []
     self._rect: rl.Rectangle = rl.Rectangle(0, 0, 0, 0)
     self._parent_rect: rl.Rectangle | None = None
     self.__is_pressed = [False] * MAX_TOUCH_SLOTS
@@ -197,12 +202,24 @@ def _handle_mouse_event(self, mouse_event: MouseEvent) -> None:
     """Optionally handle mouse events. This is called before rendering."""
     # Default implementation does nothing, can be overridden by subclasses
 
+  def _child(self, widget: W) -> W:
+    """Register a widget as a child. Lifecycle events (show/hide) propagate to registered children."""
+    self._children.append(widget)
+    return widget
+
   def show_event(self):
-    """Optionally handle show event. Parent must manually call this"""
-    # TODO: iterate through all child objects, check for subclassing from Widget/Layout (Scroller)
+    """Called when widget becomes visible. Propagates to registered children."""
+    print(f"show_event: {type(self).__name__}")
+    for child in self._children:
+      print(f"  show_event: {type(self).__name__} -> {type(child).__name__}")
+      child.show_event()
 
   def hide_event(self):
-    """Optionally handle hide event. Parent must manually call this"""
+    """Called when widget is hidden. Propagates to registered children."""
+    print(f"hide_event: {type(self).__name__}")
+    for child in self._children:
+      print(f"  hide_event: {type(self).__name__} -> {type(child).__name__}")
+      child.hide_event()
 
   def dismiss(self, callback: Callable[[], None] | None = None):
     """Immediately dismiss the widget, firing the callback after."""

system/ui/widgets/nav_widget.py

@@ -69,7 +69,7 @@ def __init__(self):
     self._shown_callback: Callable[[], None] | None = None  # transient callback fired after show animation completes
 
     # TODO: move this state into NavBar
-    self._nav_bar = NavBar()
+    self._nav_bar = self._child(NavBar())
     self._nav_bar_show_time = 0.0
     self._nav_bar_y_filter = FirstOrderFilter(0.0, 0.1, 1 / gui_app.target_fps)
 
@@ -214,7 +214,6 @@ def dismiss(self, callback: Callable[[], None] | None = None):
 
   def show_event(self):
     super().show_event()
-    self._nav_bar.show_event()
 
     # Reset state
     self._drag_start_pos = None

system/ui/widgets/scroller.py

@@ -422,18 +422,10 @@ class Scroller(Widget):
   """Wrapper for _Scroller so that children do not need to call events or pass down enabled for nav stack."""
   def __init__(self, **kwargs):
     super().__init__()
-    self._scroller = _Scroller([], **kwargs)
+    self._scroller = self._child(_Scroller([], **kwargs))
     # pass down enabled to child widget for nav stack
     self._scroller.set_enabled(lambda: self.enabled)
 
-  def show_event(self):
-    super().show_event()
-    self._scroller.show_event()
-
-  def hide_event(self):
-    super().hide_event()
-    self._scroller.hide_event()
-
   def _render(self, _):
     self._scroller.render(self._rect)