ui: re-compute text size (#35907)

* one

* app

* fix
pull/35895/head
Maxime Desroches 1 week ago committed by GitHub
parent 8cce8cf3f3
commit 181ea39a83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      system/ui/setup.py
  2. 7
      system/ui/widgets/button.py

@ -195,7 +195,7 @@ class Setup(Widget):
continue_enabled = self.network_connected.is_set()
self._network_setup_continue_button.enabled = continue_enabled
continue_text = ("Continue" if self.wifi_connected.is_set() else "Continue without Wi-Fi") if continue_enabled else "Waiting for internet"
self._network_setup_continue_button._text = continue_text
self._network_setup_continue_button.set_text(continue_text)
self._network_setup_continue_button.render(rl.Rectangle(rect.x + MARGIN + button_width + BUTTON_SPACING, button_y, button_width, BUTTON_HEIGHT))
def render_software_selection(self, rect: rl.Rectangle):

@ -184,14 +184,19 @@ class Button(Widget):
self._button_style = button_style
self._border_radius = border_radius
self._font_size = font_size
self._font_weight = font_weight
self._text_color = BUTTON_TEXT_COLOR[button_style]
self._background_color = BUTTON_BACKGROUND_COLORS[button_style]
self._text_size = measure_text_cached(gui_app.font(font_weight), text, font_size)
self._text_alignment = text_alignment
self._text_padding = text_padding
self._text_size = measure_text_cached(gui_app.font(self._font_weight), self._text, self._font_size)
self._icon = icon
self.enabled = enabled
def set_text(self, text):
self._text = text
self._text_size = measure_text_cached(gui_app.font(self._font_weight), self._text, self._font_size)
def _handle_mouse_release(self, mouse_pos: MousePos):
if self._click_callback and self.enabled:
self._click_callback()

Loading…
Cancel
Save