UI

system/ui/widgets/confirm_dialog.py

@@ -1,5 +1,5 @@
-from collections.abc import Callable
 import pyray as rl
+from collections.abc import Callable
 from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.multilang import tr
 from openpilot.system.ui.widgets import DialogResult
@@ -18,7 +18,7 @@ BACKGROUND_COLOR = rl.Color(27, 27, 27, 255)
 
 
 class ConfirmDialog(Widget):
-  def __init__(self, text: str, confirm_text: str, cancel_text: str | None = None, rich: bool = False, on_close: Callable[[DialogResult], None] | None = None):
+  def __init__(self, text: str, confirm_text: str, cancel_text: str | None = None, rich: bool = False, callback: Callable[[DialogResult], None] | None = None):
     super().__init__()
     if cancel_text is None:
       cancel_text = tr("Cancel")
@@ -27,8 +27,7 @@ class ConfirmDialog(Widget):
     self._cancel_button = Button(cancel_text, self._cancel_button_callback)
     self._confirm_button = Button(confirm_text, self._confirm_button_callback, button_style=ButtonStyle.PRIMARY)
     self._rich = rich
-    self._dialog_result = DialogResult.NO_ACTION
-    self._on_close = on_close
+    self._callback = callback
     self._cancel_text = cancel_text
     self._scroller = Scroller([self._html_renderer], line_separator=False, spacing=0)
 
@@ -38,17 +37,15 @@ class ConfirmDialog(Widget):
     else:
       self._html_renderer.parse_html_content(text)
 
-  def reset(self):
-    self._dialog_result = DialogResult.NO_ACTION
-    self._on_close = on_close
-
   def _cancel_button_callback(self):
-    self._dialog_result = DialogResult.CANCEL
-    if self._on_close: self._on_close(self._dialog_result)
+    gui_app.pop_widget()
+    if self._callback:
+      self._callback(DialogResult.CANCEL)
 
   def _confirm_button_callback(self):
-    self._dialog_result = DialogResult.CONFIRM
-    if self._on_close: self._on_close(self._dialog_result)
+    gui_app.pop_widget()
+    if self._callback:
+      self._callback(DialogResult.CONFIRM)
 
   def _render(self, rect: rl.Rectangle):
     dialog_x = OUTER_MARGIN if not self._rich else RICH_OUTER_MARGIN
@@ -78,11 +75,9 @@ class ConfirmDialog(Widget):
       self._scroller.render(text_rect)
 
     if rl.is_key_pressed(rl.KeyboardKey.KEY_ENTER):
-      self._dialog_result = DialogResult.CONFIRM
-      if self._on_close: self._on_close(self._dialog_result)
+      self._confirm_button_callback()
     elif rl.is_key_pressed(rl.KeyboardKey.KEY_ESCAPE):
-      self._dialog_result = DialogResult.CANCEL
-      if self._on_close: self._on_close(self._dialog_result)
+      self._cancel_button_callback()
 
     if self._cancel_text:
       self._confirm_button.render(confirm_button)
@@ -92,8 +87,6 @@ class ConfirmDialog(Widget):
       full_confirm_button = rl.Rectangle(dialog_rect.x + MARGIN, button_y, full_button_width, BUTTON_HEIGHT)
       self._confirm_button.render(full_confirm_button)
 
-    return self._dialog_result
-
 
 def alert_dialog(message: str, button_text: str | None = None):
   if button_text is None: