ui: SimpleButtonActionSP (#1502)

* commaai/openpilot:d05cb31e2e916fba41ba8167030945f427fd811b * bump opendbc * bump opendbc * bump opendbc * bump opendbc * bump opendbc * sunnypilot: remove Qt * cabana: revert to stock Qt * commaai/openpilot:5198b1b079c37742c1050f02ce0aa6dd42b038b9 * commaai/openpilot:954b567b9ba0f3d1ae57d6aa7797fa86dd92ec6e * commaai/openpilot:7534b2a160faa683412c04c1254440e338931c5e * sum more * bump opendbc * not yet * should've been symlink'ed * raylib says wut * quiet mode back * more fixes * no more * too extra red diff on the side * need to bring this back * too extra * let's update docs here * Revert "let's update docs here" This reverts commit 51fe03cd5121e6fdf14657b2c33852c34922b851. * param to control stock vs sp ui * init styles * SP Toggles * Lint * optimizations * multi-button * Lint * param to control stock vs sp ui * init styles * SP Toggles * Lint * optimizations * sp raylib preview * fix callback * fix ui preview * better padding * this * support for next line multi-button * uhh * disabled colors * listitem -> listitemsp * listitem -> listitemsp * add show_description method * remove padding from line separator. like, WHY? 😩😩 * ui: `GuiApplicationExt` * simple button * simple button * add to readme * use gui_app.sunnypilot_ui() * i've got something to confessa * sync * revert * Fix SimpleButtonActionSP not respecting enabled state * some more * ui: `ButtonSP` * slight cleanup * fixes * fix * unused * try this --------- Co-authored-by: Jason Wen <haibin.wen3@gmail.com> Co-authored-by: DevTekVE <devtekve@gmail.com> Co-authored-by: James Vecellio-Grant <159560811+Discountchubbs@users.noreply.github.com> Co-authored-by: discountchubbs <alexgrant990@gmail.com>
2026-09-01 05:33:49 +08:00 · 2025-12-14 23:18:49 -05:00
parent 9c2fd8d2be
commit e7554170b8
2 changed files with 33 additions and 6 deletions
@@ -31,6 +31,10 @@ class Base:
  BUTTON_ACTION_WIDTH = 300
  BUTTON_HEIGHT = 120

+  # Simple Button Control
+  SIMPLE_BUTTON_WIDTH = 800
+  SIMPLE_BUTTON_HEIGHT = 150
+

@dataclass
 class DefaultStyleSP(Base):
@@ -11,7 +11,7 @@ from openpilot.common.params import Params
 from openpilot.system.ui.lib.application import gui_app, MousePos, FontWeight
 from openpilot.system.ui.lib.text_measure import measure_text_cached
 from openpilot.system.ui.sunnypilot.widgets.toggle import ToggleSP
-from openpilot.system.ui.widgets.button import Button
+from openpilot.system.ui.widgets.button import Button, ButtonStyle
 from openpilot.system.ui.widgets.label import gui_label
 from openpilot.system.ui.widgets.list_view import ListItem, ToggleAction, ItemAction, MultipleButtonAction, ButtonAction, \
                                                  _resolve_value, BUTTON_WIDTH, BUTTON_HEIGHT, TEXT_PADDING
@@ -39,6 +39,22 @@ class ButtonSP(Button):
      self._label.set_text_color(style.BUTTON_TEXT_DISABLED)


+class SimpleButtonActionSP(ItemAction):
+  def __init__(self, button_text: str | Callable[[], str], callback: Callable = None,
+               enabled: bool | Callable[[], bool] = True, button_width: int = style.SIMPLE_BUTTON_WIDTH):
+    super().__init__(width=button_width, enabled=enabled)
+    self.button_action = ButtonSP(button_text, click_callback=callback, button_style=ButtonStyle.NORMAL,
+                                  border_radius=20)
+
+  def set_touch_valid_callback(self, touch_callback: Callable[[], bool]) -> None:
+    super().set_touch_valid_callback(touch_callback)
+    self.button_action.set_touch_valid_callback(touch_callback)
+
+  def _render(self, rect: rl.Rectangle) -> bool | int | None:
+    self.button_action.set_enabled(self.enabled)
+    return self.button_action.render(rect)
+
+
 class ButtonActionSP(ButtonAction):
  def __init__(self, text: str | Callable[[], str], width: int = style.BUTTON_ACTION_WIDTH, enabled: bool | Callable[[], bool] = True):
    super().__init__(text=text, width=width, enabled=enabled)
@@ -179,7 +195,7 @@ class ListItemSP(ListItem):
    content_width = item_rect.width - (style.ITEM_PADDING * 2)
    title_width = measure_text_cached(self._font, self.title, style.ITEM_TEXT_FONT_SIZE).x
    right_width = min(content_width - title_width, right_width)
-    if isinstance(self.action_item, ToggleAction):
+    if isinstance(self.action_item, ToggleAction) or isinstance(self.action_item, SimpleButtonActionSP):
      action_x = item_rect.x
    else:
      action_x = item_rect.x + item_rect.width - right_width
@@ -196,14 +212,15 @@ class ListItemSP(ListItem):

    content_x = self._rect.x + style.ITEM_PADDING
    text_x = content_x
-    left_action_item = isinstance(self.action_item, ToggleAction)
+    left_action_item = isinstance(self.action_item, ToggleAction) or isinstance(self.action_item, SimpleButtonActionSP)

    if left_action_item:
+      item_height = style.SIMPLE_BUTTON_HEIGHT if isinstance(self.action_item, SimpleButtonActionSP) else style.TOGGLE_HEIGHT
      left_rect = rl.Rectangle(
        content_x,
-        self._rect.y + (style.ITEM_BASE_HEIGHT - style.TOGGLE_HEIGHT) // 2,
-        style.TOGGLE_WIDTH,
-        style.TOGGLE_HEIGHT
+        self._rect.y + (style.ITEM_BASE_HEIGHT - item_height) // 2,
+        self.action_item.rect.width,
+        item_height
      )
      text_x = left_rect.x + left_rect.width + style.ITEM_PADDING * 1.5

@@ -259,6 +276,12 @@ class ListItemSP(ListItem):
      self._html_renderer.render(description_rect)


+def simple_button_item_sp(button_text: str | Callable[[], str], callback: Callable | None = None,
+                          enabled: bool | Callable[[], bool] = True, button_width: int = style.SIMPLE_BUTTON_WIDTH) -> ListItemSP:
+  action = SimpleButtonActionSP(button_text=button_text, enabled=enabled, callback=callback, button_width=button_width)
+  return ListItemSP(title="", callback=callback, description="", action_item=action)
+
+
 def toggle_item_sp(title: str | Callable[[], str], description: str | Callable[[], str] | None = None, initial_state: bool = False,
                   callback: Callable | None = None, icon: str = "", enabled: bool | Callable[[], bool] = True, param: str | None = None) -> ListItemSP:
  action = ToggleActionSP(initial_state=initial_state, enabled=enabled, callback=callback, param=param)