bwah

OpenDreamProject · Jan 2, 2024 · 57fa1d8 · 57fa1d8
1 parent 61658c5
commit 57fa1d8
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/OpenDreamClient/Interface/Prompts/ColorPrompt.cs b/OpenDreamClient/Interface/Prompts/ColorPrompt.cs
@@ -14,12 +14,10 @@ internal sealed class ColorPrompt : InputWindow {
     private readonly ColorSelectorSliders _colorSelector;
     private readonly LineEdit _hexColor;
     private readonly Button _preview;
-    private readonly bool _nullable;
     private readonly Color _originalColor;
 
     public ColorPrompt(string title, string message, string defaultValue, bool canCancel,
-        Action<DMValueType, object?>? onClose, bool alpha = false) : base(title, message, true, onClose) {
-        _nullable = canCancel;
+        Action<DMValueType, object?>? onClose, bool alpha = false) : base(title, message, canCancel, onClose) {
         _originalColor = Color.FromHex(defaultValue, Color.White);
         _colorSelector = new() {
             Color = _originalColor,
@@ -77,15 +75,8 @@ private void LineEdit_OnFinishInput(LineEdit.LineEditEventArgs args) {
         }
     }
 
-    protected override void ButtonClicked(string button) {
-        if (button == "Ok") {
-            FinishPrompt(DMValueType.Color, _colorSelector.Color);
-        } else if (!_nullable) {
-            FinishPrompt(DMValueType.Color, _originalColor);
-        } else {
-            FinishPrompt(DMValueType.Null, null);
-        }
-        Close();
+    protected override void OkButtonClicked() {
+        FinishPrompt(DMValueType.Color, _colorSelector.Color);
     }
 }