mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-08-05 00:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

BigUP WIP: System Settings Pass

Browse Source
This commit is contained in:
firestarsdog
2026-06-01 01:19:50 -04:00
parent 6dc473713c
commit 14f94151a5
2 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/layouts/settings/starpilot/aethergrid.py
+15 -4
View File
@@ -3433,6 +3433,7 @@ class AetherSegmentedControl(Widget):
on_change: Callable[[int], None],
statuses: list[str | Callable[[], str] | None] | None = None,
compact: bool = False,
style: PanelStyle | None = None,
):
super().__init__()
self._options = options
@@ -3442,6 +3443,7 @@ class AetherSegmentedControl(Widget):
if len(self._statuses) < len(self._options):
self._statuses += [""] * (len(self._options) - len(self._statuses))
self._compact = compact
self._style = style
self._font = gui_app.font(FontWeight.BOLD)
self._font_status = gui_app.font(FontWeight.NORMAL)
self._pressed_index = -1
@@ -3530,8 +3532,18 @@ class AetherSegmentedControl(Widget):
face_rect = _snap_rect(rl.Rectangle(base_rect.x, base_rect.y + min(1.0, offset), base_rect.width, base_rect.height))
is_active = i == current_index
fill = rl.Color(255, 255, 255, 12) if is_active else rl.Color(255, 255, 255, 3)
border = rl.Color(255, 255, 255, 30) if is_active else rl.Color(255, 255, 255, 8)
if self._style is not None:
accent = self._style.accent
fill = _mix_colors(rl.Color(18, 22, 28, 255), accent, 0.16, alpha=255) if is_active else rl.Color(255, 255, 255, 3)
border = _with_alpha(accent, 72) if is_active else rl.Color(255, 255, 255, 8)
title_color = accent if is_active else AetherListColors.SUBTEXT
status_color = _mix_colors(accent, AetherListColors.HEADER, 0.4) if is_active else AetherListColors.MUTED
else:
fill = rl.Color(255, 255, 255, 12) if is_active else rl.Color(255, 255, 255, 3)
border = rl.Color(255, 255, 255, 30) if is_active else rl.Color(255, 255, 255, 8)
title_color = AetherListColors.HEADER if is_active else AetherListColors.SUBTEXT
status_color = AetherListColors.MUTED
_draw_rounded_fill(face_rect, fill, radius_px=16)
_draw_rounded_stroke(face_rect, border, radius_px=16)
rl.draw_rectangle_rec(rl.Rectangle(face_rect.x, face_rect.y, face_rect.width, 1), rl.Color(255, 255, 255, 18 if is_active else 10))
@@ -3540,7 +3552,6 @@ class AetherSegmentedControl(Widget):
status = str(_resolve_value(self._statuses[i], ""))
title_size = max(18, min(24, int(face_rect.height * (0.28 if has_status else 0.36))))
status_size = max(14, min(17, int(face_rect.height * 0.22)))
title_color = AetherListColors.HEADER if is_active else AetherListColors.SUBTEXT
if has_status:
title_y = face_rect.y + max(9.0, min(14.0, face_rect.height * 0.18))
@@ -3561,7 +3572,7 @@ class AetherSegmentedControl(Widget):
face_rect.width - 32,
status_size,
align_center=True,
color=AetherListColors.MUTED,
color=status_color,
)
else:
_draw_text_fit_common(
selfdrive/ui/layouts/settings/starpilot/system_settings.py
+30 -22
View File
@@ -98,8 +98,8 @@ PANEL_STYLE = panel_style_from_color("#D946EF")
class SystemSettingsManagerView(AetherInteractiveMixin, Widget):
HEADER_SUBTITLE_HEIGHT = 24
HEADER_SUMMARY_GAP = 12
HEADER_CARD_HEIGHT = 108
HEADER_SUMMARY_GAP = 6
HEADER_CARD_HEIGHT = 140
TAB_HEIGHT = 68
TAB_GAP = 10
TAB_BOTTOM_GAP = 18
@@ -319,6 +319,7 @@ class SystemSettingsManagerView(AetherInteractiveMixin, Widget):
self._get_drive_mode_index,
self._on_drive_mode_change,
statuses=[tr("Default"), tr("Force on"), tr("Force off")],
style=PANEL_STYLE,
)
)
@@ -510,37 +511,44 @@ class SystemSettingsManagerView(AetherInteractiveMixin, Widget):
def _draw_summary_card(self, rect: rl.Rectangle):
draw_soft_card(rect, PANEL_STYLE.surface_fill, PANEL_STYLE.surface_border)
inset = 18
left_x = rect.x + inset
left_w = rect.width * 0.40
gui_label(rl.Rectangle(left_x, rect.y + 9, left_w, 22), tr("Current Drive State"), 20, AetherListColors.MUTED, FontWeight.MEDIUM)
gui_label(rl.Rectangle(left_x, rect.y + 33, left_w, 28), self._controller._get_force_drive_state(), 24, AetherListColors.HEADER, FontWeight.MEDIUM)
control_w = max(300.0, min(420.0, rect.width * 0.34))
control_x = rect.x + rect.width - control_w - inset
# Left Column: Huge Segmented Control
control_w = max(420.0, min(540.0, rect.width * 0.46))
control_x = rect.x + inset
control_h = 96.0
control_y = rect.y + (rect.height - control_h) / 2
metric_col_x = left_x + left_w + 24
metric_col_w = control_x - 24 - metric_col_x
control_rect = rl.Rectangle(control_x, control_y, control_w, control_h)
self._drive_mode_control.render(control_rect)
# Right Column: Labels & Metrics
right_x = control_x + control_w + 32
right_w = rect.x + rect.width - inset - right_x
# Header Labels
header_y = rect.y + 12
gui_label(rl.Rectangle(right_x, header_y, right_w, 20),
tr("System Status"), 16, AetherListColors.MUTED, FontWeight.SEMI_BOLD)
# Metrics
metric_rows = [
(tr("Storage"), self._controller.storage_summary()),
(tr("System Backups"), self._controller.backup_count_text()),
(tr("Toggle Snapshots"), self._controller.toggle_backup_count_text()),
]
metric_row_h = 18
metric_row_gap = 6
metric_start_y = rect.y + 14
metric_row_h = 16
metric_row_gap = 4
metric_start_y = rect.y + 42
label_font = gui_app.font(FontWeight.MEDIUM)
for i, (label, value) in enumerate(metric_rows):
row_y = metric_start_y + i * (metric_row_h + metric_row_gap)
label_w = measure_text_cached(label_font, label, 18).x + 4
gui_label(rl.Rectangle(metric_col_x, row_y, label_w, metric_row_h + 2),
label, 18, AetherListColors.MUTED, FontWeight.MEDIUM)
value_x = metric_col_x + label_w + 12
gui_label(rl.Rectangle(value_x, row_y, metric_col_x + metric_col_w - value_x, metric_row_h + 2),
value, 18, AetherListColors.HEADER, FontWeight.MEDIUM)
control_rect = rl.Rectangle(control_x, rect.y + 14, control_w, rect.height - 28)
self._drive_mode_control.render(control_rect)
label_w_metric = measure_text_cached(label_font, label, 16).x + 4
gui_label(rl.Rectangle(right_x, row_y, label_w_metric, metric_row_h + 2),
label, 16, AetherListColors.MUTED, FontWeight.MEDIUM)
value_x = right_x + label_w_metric + 12
gui_label(rl.Rectangle(value_x, row_y, right_x + right_w - value_x, metric_row_h + 2),
value, 16, AetherListColors.HEADER, FontWeight.MEDIUM)
def _measure_content_height(self, width: float) -> float:
display_h = self._section_block_height(self._slider_section_height(self._display_slider_keys, width))