UI

system/ui/widgets/keyboard.py

@@ -7,7 +7,7 @@ import pyray as rl
 
 from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.multilang import tr
-from openpilot.system.ui.widgets import Widget, DialogResult
+from openpilot.system.ui.widgets import DialogResult, Widget
 from openpilot.system.ui.widgets.button import ButtonStyle, Button
 from openpilot.system.ui.widgets.inputbox import InputBox
 from openpilot.system.ui.widgets.label import Label
@@ -59,14 +59,8 @@ KEYBOARD_LAYOUTS = {
 
 
 class Keyboard(Widget):
-  def __init__(
-    self,
-    max_text_size: int = 255,
-    min_text_size: int = 0,
-    password_mode: bool = False,
-    show_password_toggle: bool = False,
-    callback: Callable[[DialogResult], None] | None = None,
-  ):
+  def __init__(self, max_text_size: int = 255, min_text_size: int = 0, password_mode: bool = False, show_password_toggle: bool = False,
+               callback: Callable[[DialogResult], None] | None = None):
     super().__init__()
     self._layout_name: Literal["lowercase", "uppercase", "numbers", "specials"] = "lowercase"
     self._caps_lock = False
@@ -86,9 +80,6 @@ class Keyboard(Widget):
     self._backspace_press_time: float = 0.0
     self._backspace_last_repeat: float = 0.0
 
-    self._render_return_status = -1
-    self._first_render = False
-    self._skip_input = False
     self._cancel_button = Button(lambda: tr("Cancel"), self._cancel_button_callback)
 
     self._eye_button = Button("", self._eye_button_callback, button_style=ButtonStyle.TRANSPARENT)
@@ -109,18 +100,12 @@ class Keyboard(Widget):
         for _, key in enumerate(keys):
           if key in self._key_icons:
             texture = self._key_icons[key]
-            self._all_keys[key] = Button(
-              "",
-              partial(self._key_callback, key),
-              icon=texture,
-              button_style=ButtonStyle.PRIMARY if key == ENTER_KEY else ButtonStyle.KEYBOARD,
-              multi_touch=True,
-            )
+            self._all_keys[key] = Button("", partial(self._key_callback, key), icon=texture,
+                                         button_style=ButtonStyle.PRIMARY if key == ENTER_KEY else ButtonStyle.KEYBOARD, multi_touch=True)
           else:
             self._all_keys[key] = Button(key, partial(self._key_callback, key), button_style=ButtonStyle.KEYBOARD, font_size=85, multi_touch=True)
-    self._all_keys[CAPS_LOCK_KEY] = Button(
-      "", partial(self._key_callback, CAPS_LOCK_KEY), icon=self._key_icons[CAPS_LOCK_KEY], button_style=ButtonStyle.KEYBOARD, multi_touch=True
-    )
+    self._all_keys[CAPS_LOCK_KEY] = Button("", partial(self._key_callback, CAPS_LOCK_KEY), icon=self._key_icons[CAPS_LOCK_KEY],
+                                           button_style=ButtonStyle.KEYBOARD, multi_touch=True)
 
   def set_text(self, text: str):
     self._input_box.text = text
@@ -142,39 +127,24 @@ class Keyboard(Widget):
   def set_callback(self, callback: Callable[[DialogResult], None] | None):
     self._callback = callback
 
-  def show_event(self):
-    super().show_event()
-    self._skip_input = True
-
-  def _process_mouse_events(self):
-    if not self._skip_input:
-      super()._process_mouse_events()
-
-  def _cancel_button_callback(self):
-    self.clear()
-    if self in gui_app._nav_stack:
-      gui_app.pop_widget()
-    else:
-      self._render_return_status = 0
-    if self._callback:
-      self._callback(DialogResult.CANCEL)
-
   def _eye_button_callback(self):
     self._password_mode = not self._password_mode
 
+  def _cancel_button_callback(self):
+    self.clear()
+    gui_app.pop_widget()
+    if self._callback:
+      self._callback(DialogResult.CANCEL)
+
   def _key_callback(self, k):
     if k == ENTER_KEY:
-      if self in gui_app._nav_stack:
-        gui_app.pop_widget()
-      else:
-        self._render_return_status = 1
+      gui_app.pop_widget()
       if self._callback:
         self._callback(DialogResult.CONFIRM)
     else:
       self.handle_key_press(k)
 
   def _render(self, rect: rl.Rectangle):
-    self._skip_input = False
     rect = rl.Rectangle(rect.x + CONTENT_MARGIN, rect.y + CONTENT_MARGIN, rect.width - 2 * CONTENT_MARGIN, rect.height - 2 * CONTENT_MARGIN)
     self._title.render(rl.Rectangle(rect.x, rect.y, rect.width, 95))
     self._sub_title.render(rl.Rectangle(rect.x, rect.y + 95, rect.width, 60))
@@ -236,8 +206,6 @@ class Keyboard(Widget):
           self._all_keys[key].set_enabled(is_enabled)
           self._all_keys[key].render(key_rect)
 
-    return self._render_return_status
-
   def _render_input_area(self, input_rect: rl.Rectangle):
     if self._show_password_toggle:
       self._input_box.set_password_mode(self._password_mode)
@@ -289,7 +257,6 @@ class Keyboard(Widget):
   def reset(self, min_text_size: int | None = None):
     if min_text_size is not None:
       self._min_text_size = min_text_size
-    self._render_return_status = -1
     self._last_shift_press_time = 0
     self._backspace_pressed = False
     self._backspace_press_time = 0.0
@@ -298,15 +265,18 @@ class Keyboard(Widget):
 
 
 if __name__ == "__main__":
-  gui_app.init_window("Keyboard")
-  keyboard = Keyboard(min_text_size=8, show_password_toggle=True)
-  for _ in gui_app.render():
-    keyboard.set_title("Keyboard Input", "Type your text below")
-    result = keyboard.render(rl.Rectangle(0, 0, gui_app.width, gui_app.height))
-    if result == 1:
+  def callback(result: DialogResult):
+    if result == DialogResult.CONFIRM:
       print(f"You typed: {keyboard.text}")
-      gui_app.request_close()
-    elif result == 0:
+    elif result == DialogResult.CANCEL:
       print("Canceled")
-      gui_app.request_close()
+    gui_app.request_close()
+
+  gui_app.init_window("Keyboard")
+  keyboard = Keyboard(min_text_size=8, show_password_toggle=True, callback=callback)
+  keyboard.set_title("Keyboard Input", "Type your text below")
+
+  gui_app.push_widget(keyboard)
+  for _ in gui_app.render():
+    pass
   gui_app.close()