From e93a7234bcb3144d4b7dd9fad189d55830c7831d Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Mon, 9 Jun 2025 10:12:56 +0800
Subject: [PATCH] pyui: add DialogResult enum (#35500)

add DialogResult enum
---
 system/ui/lib/application.py        |  6 ++++++
 system/ui/widgets/confirm_dialog.py | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/system/ui/lib/application.py b/system/ui/lib/application.py
index 72b408be53..fb1d0eeb9c 100644
--- a/system/ui/lib/application.py
+++ b/system/ui/lib/application.py
@@ -27,6 +27,12 @@ ASSETS_DIR = files("openpilot.selfdrive").joinpath("assets")
 FONT_DIR = ASSETS_DIR.joinpath("fonts")
 
 
+class DialogResult(IntEnum):
+  CANCEL = 0
+  CONFIRM = 1
+  NO_ACTION = -1
+
+
 class Widget(abc.ABC):
   def __init__(self):
     self._is_pressed = False
diff --git a/system/ui/widgets/confirm_dialog.py b/system/ui/widgets/confirm_dialog.py
index f42220053b..f3ef79942d 100644
--- a/system/ui/widgets/confirm_dialog.py
+++ b/system/ui/widgets/confirm_dialog.py
@@ -1,9 +1,9 @@
 import pyray as rl
-from openpilot.system.ui.lib.application import gui_app
+from openpilot.system.ui.lib.application import gui_app, DialogResult
 from openpilot.system.ui.lib.button import gui_button, ButtonStyle
 from openpilot.system.ui.lib.label import gui_text_box
 
-# Constants for dialog dimensions and styling
+
 DIALOG_WIDTH = 1520
 DIALOG_HEIGHT = 600
 BUTTON_HEIGHT = 160
@@ -12,7 +12,7 @@ TEXT_AREA_HEIGHT_REDUCTION = 200
 BACKGROUND_COLOR = rl.Color(27, 27, 27, 255)
 
 
-def confirm_dialog(message: str, confirm_text: str, cancel_text: str = "Cancel") -> int:
+def confirm_dialog(message: str, confirm_text: str, cancel_text: str = "Cancel") -> DialogResult:
   dialog_x = (gui_app.width - DIALOG_WIDTH) / 2
   dialog_y = (gui_app.height - DIALOG_HEIGHT) / 2
   dialog_rect = rl.Rectangle(dialog_x, dialog_y, DIALOG_WIDTH, DIALOG_HEIGHT)
@@ -40,18 +40,18 @@ def confirm_dialog(message: str, confirm_text: str, cancel_text: str = "Cancel")
   )
 
   # Initialize result; -1 means no action taken yet
-  result = -1
+  result = DialogResult.NO_ACTION
 
   # Check for keyboard input for accessibility
   if rl.is_key_pressed(rl.KeyboardKey.KEY_ENTER):
-    result = 1  # Confirm
+    result = DialogResult.CONFIRM
   elif rl.is_key_pressed(rl.KeyboardKey.KEY_ESCAPE):
-    result = 0  # Cancel
+    result = DialogResult.CANCEL
 
   # Check for button clicks
   if gui_button(yes_button, confirm_text, button_style=ButtonStyle.PRIMARY):
-    result = 1  # Confirm
+    result = DialogResult.CONFIRM
   if gui_button(no_button, cancel_text):
-    result = 0  # Cancel
+    result = DialogResult.CANCEL
 
   return result