From c1f251a34f27ecfb4e0896e7dd2e0502a1547aa4 Mon Sep 17 00:00:00 2001 From: nayan Date: Tue, 22 Jul 2025 11:21:58 -0400 Subject: [PATCH] better, bigger toggles --- system/ui/sunnypilot/lib/list_view.py | 4 ++-- system/ui/sunnypilot/lib/styles.py | 10 ++++++---- system/ui/sunnypilot/lib/toggle.py | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/system/ui/sunnypilot/lib/list_view.py b/system/ui/sunnypilot/lib/list_view.py index 6234c39443..75c46f4612 100644 --- a/system/ui/sunnypilot/lib/list_view.py +++ b/system/ui/sunnypilot/lib/list_view.py @@ -70,9 +70,9 @@ class ListItemSP(ListItem): if left_action_item: left_rect = rl.Rectangle( content_x, - self._rect.y + (style.ITEM_BASE_HEIGHT - style.BUTTON_HEIGHT) // 2, + self._rect.y + (style.ITEM_BASE_HEIGHT - style.TOGGLE_HEIGHT) // 2, style.TOGGLE_WIDTH, - style.BUTTON_HEIGHT + style.TOGGLE_HEIGHT ) text_x = left_rect.x + left_rect.width + style.ITEM_PADDING diff --git a/system/ui/sunnypilot/lib/styles.py b/system/ui/sunnypilot/lib/styles.py index 60d5fe3bf6..d524c5b8b8 100644 --- a/system/ui/sunnypilot/lib/styles.py +++ b/system/ui/sunnypilot/lib/styles.py @@ -13,13 +13,15 @@ class Default: # Widget/Control Dimensions ITEM_BASE_HEIGHT = 170 - ITEM_PADDING = 20 + ITEM_PADDING = 30 ITEM_TEXT_FONT_SIZE = 50 ITEM_DESC_FONT_SIZE = 40 ITEM_DESC_V_OFFSET = 150 - TOGGLE_WIDTH = 130 - TOGGLE_HEIGHT = 80 - TOGGLE_BG_HEIGHT = 60 + + TOGGLE_HEIGHT = 100 + TOGGLE_WIDTH = TOGGLE_HEIGHT * 1.75 + TOGGLE_BG_HEIGHT = TOGGLE_HEIGHT - 20 + BUTTON_WIDTH = 250 BUTTON_HEIGHT = 100 diff --git a/system/ui/sunnypilot/lib/toggle.py b/system/ui/sunnypilot/lib/toggle.py index 013198ff2a..0e0476b1fe 100644 --- a/system/ui/sunnypilot/lib/toggle.py +++ b/system/ui/sunnypilot/lib/toggle.py @@ -18,7 +18,7 @@ class ToggleSP(Toggle): knob_color = style.TOGGLE_DISABLED_KNOB_COLOR # Draw background - bg_rect = rl.Rectangle(self._rect.x + 5, self._rect.y + 10, style.TOGGLE_WIDTH - 10, style.TOGGLE_BG_HEIGHT) + bg_rect = rl.Rectangle(self._rect.x, self._rect.y, style.TOGGLE_WIDTH, style.TOGGLE_BG_HEIGHT) # Draw outline first outline_color = style.TOGGLE_ON_COLOR @@ -43,7 +43,7 @@ class ToggleSP(Toggle): knob_travel_distance = right_edge - left_edge - 2 * knob_radius min_knob_x = left_edge + knob_radius knob_x = min_knob_x + knob_travel_distance * self._progress - knob_y = self._rect.y + style.TOGGLE_HEIGHT / 2 + knob_y = self._rect.y + style.TOGGLE_BG_HEIGHT / 2 rl.draw_circle(int(knob_x), int(knob_y), knob_radius, knob_color)