diff --git a/selfdrive/ui/onroad/exp_button.py b/selfdrive/ui/onroad/exp_button.py index f240b58d84..56f2fa0089 100644 --- a/selfdrive/ui/onroad/exp_button.py +++ b/selfdrive/ui/onroad/exp_button.py @@ -2,11 +2,11 @@ import time import pyray as rl from cereal.messaging import SubMaster from openpilot.selfdrive.ui.ui_state import ui_state -from openpilot.system.ui.lib.application import gui_app +from openpilot.system.ui.lib.application import gui_app, Widget from openpilot.common.params import Params -class ExpButton: +class ExpButton(Widget): def __init__(self, button_size: int, icon_size: int): self._params = Params() self._experimental_mode: bool = False @@ -41,8 +41,8 @@ class ExpButton: return True return False - def draw(self, x: int, y: int) -> None: - self._rect.x, self._rect.y = x, y + 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) diff --git a/selfdrive/ui/onroad/hud_renderer.py b/selfdrive/ui/onroad/hud_renderer.py index 3985927060..a9cf07d856 100644 --- a/selfdrive/ui/onroad/hud_renderer.py +++ b/selfdrive/ui/onroad/hud_renderer.py @@ -120,7 +120,7 @@ class HudRenderer(Widget): 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.draw(button_x, button_y) + self._exp_button.render(rl.Rectangle(button_x, button_y, 0, 0)) def handle_mouse_event(self) -> bool: return bool(self._exp_button.handle_mouse_event())