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

BigUI WIP: Remove icon code

Browse Source
This commit is contained in:
firestarsdog
2026-05-29 15:36:11 -04:00
parent 9673c72d44
commit a80d3680d0
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/layouts/settings/starpilot/aethergrid.py
-9
View File
@@ -2558,7 +2558,6 @@ class ToggleTile(AetherTile):
title: str,
get_state: Callable[[], bool],
set_state: Callable[[bool], None],
icon_path: str | None = None,
bg_color: rl.Color | str | None = None,
desc: str = "",
is_enabled: Callable[[], bool] | None = None,
@@ -2573,7 +2572,6 @@ class ToggleTile(AetherTile):
self.get_state = get_state
self.set_state = set_state
self.set_enabled(is_enabled or True)
self._icon = starpilot_texture(icon_path, 80, 80) if icon_path else None
self._font = gui_app.font(FontWeight.BOLD)
self._font_desc = gui_app.font(FontWeight.NORMAL)
self._active_color = self.surface_color
@@ -2607,7 +2605,6 @@ class ToggleTile(AetherTile):
self._draw_signal_edge(face, self._active_color if enabled and active else self.surface_color, width=TILE_SIGNAL_WIDTH, alpha=62 if enabled and active else 28)
self._render_tile_stack(
face,
icon=self._icon,
title=self.title,
primary=state_text,
desc=self.desc,
@@ -2625,7 +2622,6 @@ class ValueTile(AetherTile):
title: str,
get_value: Callable[[], str],
on_click: Callable,
icon_path: str | None = None,
bg_color: rl.Color | str | None = None,
is_enabled: Callable[[], bool] | None = None,
desc: str = "",
@@ -2635,7 +2631,6 @@ class ValueTile(AetherTile):
self.desc = desc
self.get_value = get_value
self.set_enabled(is_enabled or (lambda: True))
self._icon = starpilot_texture(icon_path, 80, 80) if icon_path else None
self._font = gui_app.font(FontWeight.BOLD)
self._font_desc = gui_app.font(FontWeight.NORMAL)
self._active_color = self.surface_color
@@ -2652,7 +2647,6 @@ class ValueTile(AetherTile):
self._draw_signal_edge(face, self._active_color if enabled else self._disabled_color, width=TILE_SIGNAL_WIDTH, alpha=38 if enabled else 20)
self._render_tile_stack(
face,
icon=self._icon,
title=self.title,
primary=val_text,
desc=self.desc,
@@ -2676,7 +2670,6 @@ class SliderTile(AetherTile):
min_val: float,
max_val: float,
step: float,
icon_path: str | None = None,
bg_color: rl.Color | str | None = None,
is_enabled: Callable[[], bool] | None = None,
desc: str = "",
@@ -2696,7 +2689,6 @@ class SliderTile(AetherTile):
self.labels = labels or {}
self.on_test = on_test
self.set_enabled(is_enabled or (lambda: True))
self._icon = starpilot_texture(icon_path, 80, 80) if icon_path else None
self._font = gui_app.font(FontWeight.BOLD)
self._font_desc = gui_app.font(FontWeight.NORMAL)
self._active_color = self.surface_color
@@ -2795,7 +2787,6 @@ class SliderTile(AetherTile):
val_str = self.labels.get(current_val, f"{int(current_val)}{self.unit}")
self._render_tile_stack(
face,
icon=self._icon,
title=self.title,
primary=val_str,
desc=self.desc,
selfdrive/ui/layouts/settings/starpilot/panel.py
+2 -3
View File
@@ -140,10 +140,10 @@ class StarPilotPanel(Widget):
setter(state)
self._rebuild_grid()
return ToggleTile(title=tr(cat["title"]), get_state=cat["get_state"], set_state=on_toggle, icon_path=cat.get("icon"), bg_color=cat.get("color"), desc=tr(cat.get("desc", "")), is_enabled=cat.get("is_enabled"), disabled_label=cat.get("disabled_label", ""))
return ToggleTile(title=tr(cat["title"]), get_state=cat["get_state"], set_state=on_toggle, bg_color=cat.get("color"), desc=tr(cat.get("desc", "")), is_enabled=cat.get("is_enabled"), disabled_label=cat.get("disabled_label", ""))
if tile_type == "value":
return ValueTile(title=tr(cat["title"]), get_value=cat["get_value"], on_click=cat["on_click"], icon_path=cat.get("icon"), bg_color=cat.get("color"), is_enabled=cat.get("is_enabled"), desc=tr(cat.get("desc", "")))
return ValueTile(title=tr(cat["title"]), get_value=cat["get_value"], on_click=cat["on_click"], bg_color=cat.get("color"), is_enabled=cat.get("is_enabled"), desc=tr(cat.get("desc", "")))
if tile_type == "slider":
return SliderTile(
@@ -155,7 +155,6 @@ class StarPilotPanel(Widget):
step=cat["step"],
unit=cat.get("unit", ""),
labels=cat.get("labels", {}),
icon_path=cat.get("icon"),
bg_color=cat.get("color"),
is_enabled=cat.get("is_enabled"),
desc=tr(cat.get("desc", "")),