]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix AHelp window being recentered when opened through the verb (#14219)
authorDrSmugleaf <DrSmugleaf@users.noreply.github.com>
Wed, 22 Feb 2023 12:26:02 +0000 (13:26 +0100)
committerGitHub <noreply@github.com>
Wed, 22 Feb 2023 12:26:02 +0000 (23:26 +1100)
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs

index 2e1f86acd43f5c186a51a2d34a6c725fd8824da7..21b3c9d0ff3f75bd649fa6c3b63330267b4d4e48 100644 (file)
@@ -253,6 +253,17 @@ public sealed class AdminAHelpUIHandler : IAHelpUIHandler
         Control?.OnBwoink(message.UserId);
     }
 
+    private void OpenWindow()
+    {
+        if (Window == null)
+            return;
+
+        if (EverOpened)
+            Window.Open();
+        else
+            Window.OpenCentered();
+    }
+
     public void Close()
     {
         Window?.Close();
@@ -282,18 +293,9 @@ public sealed class AdminAHelpUIHandler : IAHelpUIHandler
         EnsurePanel(_ownerId);
 
         if (IsOpen)
-        {
             Close();
-        }
         else
-        {
-            if (EverOpened)
-                Window!.Open();
-            else
-                Window!.OpenCentered();
-
-            EverOpened = true;
-        }
+            OpenWindow();
     }
 
     public event Action? OnClose;
@@ -303,7 +305,7 @@ public sealed class AdminAHelpUIHandler : IAHelpUIHandler
     public void Open(NetUserId channelId)
     {
         SelectChannel(channelId);
-        Window?.OpenCentered();
+        OpenWindow();
     }
 
     public void OnRequestClosed(WindowRequestClosedEventArgs args)