Skip to content

Fix button label widths #38680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sshane merged 7 commits into from
Aug 21, 2026
Merged

Fix button label widths #38680

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ee5d1f
Revert "ui: fix text and icon overlap on button (#38628)"
sshane Aug 19, 2026
6f1a90f
simple
sshane Aug 20, 2026
bb435ed
can do this
sshane Aug 20, 2026
b271a35
fix eliding
sshane Aug 20, 2026
a221614
Revert "fix eliding"
sshane Aug 20, 2026
6336788
clean up
sshane Aug 21, 2026
b5f9a72
clean up
sshane Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions openpilot/selfdrive/ui/mici/widgets/button.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,15 @@ def _load_images(self):
def set_touch_valid_callback(self, touch_callback: Callable[[], bool]) -> None:
super().set_touch_valid_callback(lambda: touch_callback() and self._grow_animation_until is None)

def _width_hint(self) -> int:
# A value moves the title to the top, where it shares space with the icon.
def _title_width_hint(self) -> int:
# A value moves the title to the top, where it shares space with the icon
icon_size = self._txt_icon.width if self._txt_icon and self.value else 0
return int(self._rect.width - self.LABEL_HORIZONTAL_PADDING * 2 - icon_size)

def _subtitle_width_hint(self) -> int:
# Bottom aligned, so it sits below the icon
return int(self._rect.width - self.LABEL_HORIZONTAL_PADDING * 2)

def _get_label_font_size(self):
if len(self.text) <= 18:
return 48
Expand Down Expand Up @@ -228,14 +232,14 @@ def _draw_content(self, btn_y: float):

label_color = LABEL_COLOR if self.enabled else rl.Color(255, 255, 255, int(255 * 0.35))
self._label.set_color(label_color)
label_rect = rl.Rectangle(label_x, btn_y + self.LABEL_VERTICAL_PADDING, self._width_hint(),
label_rect = rl.Rectangle(label_x, btn_y + self.LABEL_VERTICAL_PADDING, self._title_width_hint(),
self._rect.height - self.LABEL_VERTICAL_PADDING * 2)
self._label.render(label_rect)

if self.value:
label_y = btn_y + self.LABEL_VERTICAL_PADDING + self._label.get_content_height(self._width_hint())
label_y = label_rect.y + self._label.get_content_height(int(label_rect.width))
sub_label_height = btn_y + self._rect.height - self.LABEL_VERTICAL_PADDING - label_y
sub_label_rect = rl.Rectangle(label_x, label_y, self._width_hint(), sub_label_height)
sub_label_rect = rl.Rectangle(label_x, label_y, self._subtitle_width_hint(), sub_label_height)
self._sub_label.render(sub_label_rect)

# ICON -------------------------------------------------------------------
Expand Down Expand Up @@ -312,9 +316,6 @@ def __init__(self, text: str, options: list[str], toggle_callback: Callable | No

self.set_value(self._options[0])

def _width_hint(self) -> int:
return int(self._rect.width - self.LABEL_HORIZONTAL_PADDING * 2 - self._txt_enabled_toggle.width)

def _handle_mouse_release(self, mouse_pos: MousePos):
super()._handle_mouse_release(mouse_pos)
cur_idx = self._options.index(self.value)
Expand Down Expand Up @@ -363,9 +364,6 @@ def __init__(self, *args, **kwargs):
def LABEL_VERTICAL_PADDING(self):
return BigButton.LABEL_VERTICAL_PADDING if self._label.text else 18

def _width_hint(self) -> int:
return int(self._rect.width - self.LABEL_HORIZONTAL_PADDING * 2)

def _get_label_font_size(self):
return 36

Expand Down
Loading