pro review

DeltaV-Station · Jan 28, 2025 · fcffbf8 · fcffbf8
1 parent 7baaeec
commit fcffbf8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 33 deletions.
diff --git a/Content.Client/_DV/FeedbackPopup/FeedbackPopupWindow.xaml b/Content.Client/_DV/FeedbackPopup/FeedbackPopupWindow.xaml
@@ -7,11 +7,11 @@
         <RichTextLabel HorizontalAlignment="Center" Name="TitleLabel" Margin="0 0 0 20"></RichTextLabel>
         <BoxContainer Name="SectionContainer" Orientation="Vertical"></BoxContainer>
         <BoxContainer Orientation="Vertical" Name="FeedbackReplyContainer" Visible="False">
-            <Label HorizontalAlignment="Center" Text="{Loc 'feedbackpopup-text-box-above'}"></Label>
-            <TextEdit Name="FeedbackReply" MaxHeight="200" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" MinHeight="100" />
-            <Label HorizontalAlignment="Center" Text="{Loc 'feedbackpopup-text-box-below'}"></Label>
-            <Button Name="SubmitButton" Text="{Loc 'feedbackpopup-submit-feedback-button'}"></Button>
-            <Label HorizontalAlignment="Center" Text="{Loc 'feedbackpopup-disclaimer'}" StyleClasses="LabelSmall"></Label>
+            <Label HorizontalAlignment="Center" Text="{Loc 'feedbackpopup-text-box-above'}"/>
+            <TextEdit Name="FeedbackReply" MaxHeight="200" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" MinHeight="100"/>
+            <Label HorizontalAlignment="Center" Text="{Loc 'feedbackpopup-text-box-below'}"/>
+            <controls:ConfirmButton Name="SubmitButton" ConfirmationText="{Loc 'feedbackpopup-submit-feedback-button-confirm'}" Text="{Loc 'feedbackpopup-submit-feedback-button'}" />
+            <Label HorizontalAlignment="Center" Text="{Loc 'feedbackpopup-disclaimer'}" StyleClasses="LabelSmall"/>
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/_DV/FeedbackPopup/FeedbackPopupWindow.xaml.cs b/Content.Client/_DV/FeedbackPopup/FeedbackPopupWindow.xaml.cs
@@ -13,12 +13,9 @@ namespace Content.Client._DV.FeedbackPopup;
 public sealed partial class FeedbackPopupWindow : FancyWindow
 {
     [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
 
     private readonly FeedbackPopupPrototype _feedbackpopup;
 
-    private TimeSpan? _resetSubmitButtonTime;
-
     public event Action<(LocId, string)>? OnSubmitted;
 
     public FeedbackPopupWindow(ProtoId<FeedbackPopupPrototype> popupProto)
@@ -60,35 +57,11 @@ private void CreateSection(string text)
 
     private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs args)
     {
-        // Don't do anything if they haven't written anything.
+        // If they haven't written anything, ignore it.
         if (string.IsNullOrWhiteSpace(Rope.Collapse(FeedbackReply.TextRope)))
             return;
 
-        // First time the button has been clicked
-        if (_resetSubmitButtonTime == null || _resetSubmitButtonTime < _gameTiming.RealTime)
-        {
-            SubmitButton.Text = Loc.GetString("feedbackpopup-submit-feedback-button-confirm");
-            SubmitButton.ModulateSelfOverride = Color.Red;
-            _resetSubmitButtonTime = _gameTiming.RealTime + TimeSpan.FromSeconds(2);
-            return;
-        }
-
-        // Button has been clicked inside the confirmation time.
         OnSubmitted?.Invoke((_feedbackpopup.PopupName, Rope.Collapse(FeedbackReply.TextRope)));
     }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        if (_resetSubmitButtonTime < _gameTiming.RealTime)
-            ResetSubmitButton();
-    }
-
-    private void ResetSubmitButton()
-    {
-        SubmitButton.Text = Loc.GetString("feedbackpopup-submit-feedback-button");
-        SubmitButton.ModulateSelfOverride = null;
-    }
 }