raylib: common mouse press hook (#35489)

* something like this

* need these

* rest

* another pr

* what is this merge conflict

f

* fix mouse down

* rm that!

* fix that

* rearrange

* fix bug where mouse held down on widget, dragged off, then let go

* temp

* fix that

* missing init

Author: sshane

selfdrive/ui/layouts/home.py

@@ -26,6 +26,7 @@ class HomeLayoutState(IntEnum):
 
 class HomeLayout(Widget):
   def __init__(self):
+    super().__init__()
     self.params = Params()
 
     self.update_alert = UpdateAlert()
@@ -58,7 +59,7 @@ def set_settings_callback(self, callback: Callable):
   def _set_state(self, state: HomeLayoutState):
     self.current_state = state
 
-  def render(self, rect: rl.Rectangle):
+  def _render(self, rect: rl.Rectangle):
     self._update_layout_rects(rect)
 
     current_time = time.time()

selfdrive/ui/layouts/main.py

@@ -16,6 +16,7 @@ class MainState(IntEnum):
 
 class MainLayout(Widget):
   def __init__(self):
+    super().__init__()
     self._sidebar = Sidebar()
     self._sidebar_visible = True
     self._current_mode = MainState.HOME
@@ -32,7 +33,7 @@ def __init__(self):
     # Set callbacks
     self._setup_callbacks()
 
-  def render(self, rect):
+  def _render(self, rect):
     self._current_callback = None
 
     self._update_layout_rects(rect)

selfdrive/ui/layouts/network.py

@@ -6,10 +6,11 @@
 
 class NetworkLayout(Widget):
   def __init__(self):
+    super().__init__()
     self.wifi_manager = WifiManagerWrapper()
     self.wifi_ui = WifiManagerUI(self.wifi_manager)
 
-  def render(self, rect: rl.Rectangle):
+  def _render(self, rect: rl.Rectangle):
     self.wifi_ui.render(rect)
 
   def shutdown(self):

selfdrive/ui/layouts/settings/developer.py

@@ -14,6 +14,7 @@
 
 class DeveloperLayout(Widget):
   def __init__(self):
+    super().__init__()
     self._params = Params()
     items = [
       toggle_item(
@@ -44,7 +45,7 @@ def __init__(self):
 
     self._list_widget = ListView(items)
 
-  def render(self, rect):
+  def _render(self, rect):
     self._list_widget.render(rect)
 
   def _on_enable_adb(self): pass

selfdrive/ui/layouts/settings/device.py

@@ -17,6 +17,7 @@
 
 class DeviceLayout(Widget):
   def __init__(self):
+    super().__init__()
     params = Params()
     dongle_id = params.get("DongleId", encoding="utf-8") or "N/A"
     serial = params.get("HardwareSerial") or "N/A"
@@ -37,7 +38,7 @@ def __init__(self):
 
     self._list_widget = ListView(items)
 
-  def render(self, rect):
+  def _render(self, rect):
     self._list_widget.render(rect)
 
   def _on_pair_device(self): pass

selfdrive/ui/layouts/settings/settings.py

@@ -50,6 +50,7 @@ class PanelInfo:
 
 class SettingsLayout(Widget):
   def __init__(self):
+    super().__init__()
     self._params = Params()
     self._current_panel = PanelType.DEVICE
     self._max_scroll = 0.0
@@ -73,7 +74,7 @@ def __init__(self):
   def set_callbacks(self, on_close: Callable):
     self._close_callback = on_close
 
-  def render(self, rect: rl.Rectangle):
+  def _render(self, rect: rl.Rectangle):
     # Calculate layout
     sidebar_rect = rl.Rectangle(rect.x, rect.y, SIDEBAR_WIDTH, rect.height)
     panel_rect = rl.Rectangle(rect.x + SIDEBAR_WIDTH, rect.y, rect.width - SIDEBAR_WIDTH, rect.height)
@@ -82,9 +83,6 @@ def render(self, rect: rl.Rectangle):
     self._draw_sidebar(sidebar_rect)
     self._draw_current_panel(panel_rect)
 
-    if rl.is_mouse_button_released(rl.MouseButton.MOUSE_BUTTON_LEFT):
-      self.handle_mouse_release(rl.get_mouse_position())
-
   def _draw_sidebar(self, rect: rl.Rectangle):
     rl.draw_rectangle_rec(rect, SIDEBAR_COLOR)
 
@@ -154,7 +152,7 @@ def _draw_current_panel(self, rect: rl.Rectangle):
         alignment_vertical=rl.GuiTextAlignmentVertical.TEXT_ALIGN_MIDDLE,
       )
 
-  def handle_mouse_release(self, mouse_pos: rl.Vector2) -> bool:
+  def _handle_mouse_release(self, mouse_pos: rl.Vector2) -> bool:
     # Check close button
     if rl.check_collision_point_rec(mouse_pos, self._close_btn_rect):
       if self._close_callback:

selfdrive/ui/layouts/settings/software.py

@@ -4,6 +4,7 @@
 
 class SoftwareLayout(Widget):
   def __init__(self):
+    super().__init__()
     items = [
       text_item("Current Version", ""),
       button_item("Download", "CHECK", callback=self._on_download_update),
@@ -14,7 +15,7 @@ def __init__(self):
 
     self._list_widget = ListView(items)
 
-  def render(self, rect):
+  def _render(self, rect):
     self._list_widget.render(rect)
 
   def _on_download_update(self): pass

selfdrive/ui/layouts/settings/toggles.py

@@ -21,6 +21,7 @@
 
 class TogglesLayout(Widget):
   def __init__(self):
+    super().__init__()
     self._params = Params()
     items = [
       toggle_item(
@@ -65,5 +66,5 @@ def __init__(self):
 
     self._list_widget = ListView(items)
 
-  def render(self, rect):
+  def _render(self, rect):
     self._list_widget.render(rect)

selfdrive/ui/layouts/sidebar.py

@@ -62,6 +62,7 @@ def update(self, label: str, value: str, color: rl.Color):
 
 class Sidebar(Widget):
   def __init__(self):
+    super().__init__()
     self._net_type = NETWORK_TYPES.get(NetworkType.none)
     self._net_strength = 0
 
@@ -83,7 +84,7 @@ def set_callbacks(self, on_settings: Callable | None = None, on_flag: Callable |
     self._on_settings_click = on_settings
     self._on_flag_click = on_flag
 
-  def render(self, rect: rl.Rectangle):
+  def _render(self, rect: rl.Rectangle):
     self.update_state()
 
     # Background
@@ -93,8 +94,6 @@ def render(self, rect: rl.Rectangle):
     self._draw_network_indicator(rect)
     self._draw_metrics(rect)
 
-    self._handle_mouse_release()
-
   def update_state(self):
     sm = ui_state.sm
     if not sm.updated['deviceState']:
@@ -137,11 +136,7 @@ def _update_panda_status(self):
     else:
       self._panda_status.update("VEHICLE", "ONLINE", Colors.GOOD)
 
-  def _handle_mouse_release(self):
-    if not rl.is_mouse_button_released(rl.MouseButton.MOUSE_BUTTON_LEFT):
-      return
-
-    mouse_pos = rl.get_mouse_position()
+  def _handle_mouse_release(self, mouse_pos: rl.Vector2):
     if rl.check_collision_point_rec(mouse_pos, SETTINGS_BTN):
       if self._on_settings_click:
         self._on_settings_click()
@@ -151,7 +146,7 @@ def _handle_mouse_release(self):
 
   def _draw_buttons(self, rect: rl.Rectangle):
     mouse_pos = rl.get_mouse_position()
-    mouse_down = rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT)
+    mouse_down = self._is_pressed and rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT)
 
     # Settings button
     settings_down = mouse_down and rl.check_collision_point_rec(mouse_pos, SETTINGS_BTN)

selfdrive/ui/onroad/alert_renderer.py

@@ -61,6 +61,7 @@ class Alert:
 
 class AlertRenderer(Widget):
   def __init__(self):
+    super().__init__()
     self.font_regular: rl.Font = gui_app.font(FontWeight.NORMAL)
     self.font_bold: rl.Font = gui_app.font(FontWeight.BOLD)
 
@@ -91,7 +92,7 @@ def get_alert(self, sm: messaging.SubMaster) -> Alert | None:
     # Return current alert
     return Alert(text1=ss.alertText1, text2=ss.alertText2, size=ss.alertSize, status=ss.alertStatus)
 
-  def render(self, rect: rl.Rectangle) -> None:
+  def _render(self, rect: rl.Rectangle) -> None:
     alert = self.get_alert(ui_state.sm)
     if not alert:
       return

selfdrive/ui/onroad/augmented_road_view.py

@@ -52,7 +52,7 @@ def __init__(self, stream_type: VisionStreamType = VisionStreamType.VISION_STREA
     # Callbacks
     self.on_click: Callable | None = None
 
-  def render(self, rect):
+  def _render(self, rect):
     # Only render when system is started to avoid invalid data access
     if not ui_state.started:
       return
@@ -83,7 +83,7 @@ def render(self, rect):
     )
 
     # Render the base camera view
-    super().render(rect)
+    super()._render(rect)
 
     # Draw all UI overlays
     self.model_renderer.render(self._content_rect)

selfdrive/ui/onroad/cameraview.py

@@ -57,6 +57,7 @@
 
 class CameraView(Widget):
   def __init__(self, name: str, stream_type: VisionStreamType):
+    super().__init__()
     self._name = name
     # Primary stream
     self.client = VisionIpcClient(name, stream_type, conflate=True)
@@ -149,7 +150,7 @@ def _calc_frame_matrix(self, rect: rl.Rectangle) -> np.ndarray:
       [0.0, 0.0, 1.0]
     ])
 
-  def render(self, rect: rl.Rectangle):
+  def _render(self, rect: rl.Rectangle):
     if self._switching:
       self._handle_switch()
 

selfdrive/ui/onroad/driver_camera_view.py

@@ -13,8 +13,8 @@ def __init__(self, stream_type: VisionStreamType):
     super().__init__("camerad", stream_type)
     self.driver_state_renderer = DriverStateRenderer()
 
-  def render(self, rect):
-    super().render(rect)
+  def _render(self, rect):
+    super()._render(rect)
 
     if not self.frame:
       gui_label(

selfdrive/ui/onroad/driver_state.py

@@ -43,6 +43,7 @@ class ArcData:
 
 class DriverStateRenderer(Widget):
   def __init__(self):
+    super().__init__()
     # Initial state with NumPy arrays
     self.face_kpts_draw = DEFAULT_FACE_KPTS_3D.copy()
     self.is_active = False
@@ -74,7 +75,7 @@ def __init__(self):
     self.engaged_color = rl.Color(26, 242, 66, 255)
     self.disengaged_color = rl.Color(139, 139, 139, 255)
 
-  def render(self, rect):
+  def _render(self, rect):
     if not self._is_visible(ui_state.sm):
       return
 

selfdrive/ui/onroad/exp_button.py

@@ -8,6 +8,7 @@
 
 class ExpButton(Widget):
   def __init__(self, button_size: int, icon_size: int):
+    super().__init__()
     self._params = Params()
     self._experimental_mode: bool = False
     self._engageable: bool = False
@@ -41,13 +42,13 @@ def handle_mouse_event(self) -> bool:
       return True
     return False
 
-  def render(self, rect: rl.Rectangle) -> None:
+  def _render(self, rect: rl.Rectangle) -> None:
     self._rect.x, self._rect.y = rect.x, rect.y
     center_x = int(self._rect.x + self._rect.width // 2)
     center_y = int(self._rect.y + self._rect.height // 2)
 
     mouse_over = rl.check_collision_point_rec(rl.get_mouse_position(), self._rect)
-    mouse_down = rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT)
+    mouse_down = rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT) and self._is_pressed
     self._white_color.a = 180 if (mouse_down and mouse_over) or not self._engageable else 255
 
     texture = self._txt_exp if self._held_or_actual_mode() else self._txt_wheel

selfdrive/ui/onroad/hud_renderer.py

@@ -57,6 +57,7 @@ class Colors:
 
 class HudRenderer(Widget):
   def __init__(self):
+    super().__init__()
     """Initialize the HUD renderer."""
     self.is_cruise_set: bool = False
     self.is_cruise_available: bool = False
@@ -99,7 +100,7 @@ def _update_state(self, sm: SubMaster) -> None:
 
     self._exp_button.update_state(sm)
 
-  def render(self, rect: rl.Rectangle) -> None:
+  def _render(self, rect: rl.Rectangle) -> None:
     """Render HUD elements to the screen."""
     self._update_state(ui_state.sm)
 
@@ -120,7 +121,7 @@ def render(self, rect: rl.Rectangle) -> None:
 
     button_x = rect.x + rect.width - UI_CONFIG.border_size - UI_CONFIG.button_size
     button_y = rect.y + UI_CONFIG.border_size
-    self._exp_button.render(rl.Rectangle(button_x, button_y, 0, 0))
+    self._exp_button.render(rl.Rectangle(button_x, button_y, UI_CONFIG.button_size, UI_CONFIG.button_size))
 
   def handle_mouse_event(self) -> bool:
     return bool(self._exp_button.handle_mouse_event())

selfdrive/ui/onroad/model_renderer.py

@@ -45,6 +45,7 @@ class LeadVehicle:
 
 class ModelRenderer(Widget):
   def __init__(self):
+    super().__init__()
     self._longitudinal_control = False
     self._experimental_mode = False
     self._blend_factor = 1.0
@@ -86,7 +87,7 @@ def set_transform(self, transform: np.ndarray):
     self._car_space_transform = transform.astype(np.float32)
     self._transform_dirty = True
 
-  def render(self, rect: rl.Rectangle):
+  def _render(self, rect: rl.Rectangle):
     sm = ui_state.sm
 
     # Check if data is up-to-date

selfdrive/ui/widgets/offroad_alerts.py

@@ -43,6 +43,7 @@ class AlertData:
 
 class AbstractAlert(Widget, ABC):
   def __init__(self, has_reboot_btn: bool = False):
+    super().__init__()
     self.params = Params()
     self.has_reboot_btn = has_reboot_btn
     self.dismiss_callback: Callable | None = None
@@ -89,7 +90,7 @@ def handle_input(self, mouse_pos: rl.Vector2, mouse_clicked: bool) -> bool:
 
     return False
 
-  def render(self, rect: rl.Rectangle):
+  def _render(self, rect: rl.Rectangle):
     rl.draw_rectangle_rounded(rect, AlertConstants.BORDER_RADIUS / rect.width, 10, AlertColors.BACKGROUND)
 
     footer_height = AlertConstants.BUTTON_SIZE[1] + AlertConstants.SPACING

system/ui/lib/application.py

@@ -28,10 +28,33 @@
 
 
 class Widget(abc.ABC):
+  def __init__(self):
+    self._is_pressed = False
+
+  def render(self, rect: rl.Rectangle) -> bool | int | None:
+    ret = self._render(rect)
+
+    # Keep track of whether mouse down started within the widget's rectangle
+    mouse_pos = rl.get_mouse_position()
+    if rl.is_mouse_button_pressed(rl.MouseButton.MOUSE_BUTTON_LEFT):
+      if rl.check_collision_point_rec(mouse_pos, rect):
+        self._is_pressed = True
+
+    if rl.is_mouse_button_released(rl.MouseButton.MOUSE_BUTTON_LEFT):
+      if self._is_pressed and rl.check_collision_point_rec(mouse_pos, rect):
+        self._handle_mouse_release(mouse_pos)
+      self._is_pressed = False
+
+    return ret
+
   @abc.abstractmethod
-  def render(self, rect: rl.Rectangle) -> bool | None:
+  def _render(self, rect: rl.Rectangle) -> bool | int | None:
     """Render the widget within the given rectangle."""
 
+  def _handle_mouse_release(self, mouse_pos: rl.Vector2) -> bool:
+    """Handle mouse release events, if applicable."""
+    return False
+
 
 class FontWeight(IntEnum):
   THIN = 0