From 7929600def16076a289ca5be8f4411f65d8ade1b Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Wed, 8 Dec 2021 23:03:08 +0100
Subject: [PATCH] Move admin logs into their own separate window

---
 .../Administration/UI/Logs/AdminLogsEui.cs    |  72 ++++++++----
 .../UI/Logs/AdminLogsWindow.xaml              | 109 +++++++++---------
 .../UI/Logs/AdminLogsWindow.xaml.cs           |   4 +-
 3 files changed, 109 insertions(+), 76 deletions(-)

diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 00cc21671d..5f4c57c63b 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -4,6 +4,10 @@ using Content.Shared.Administration;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.IoC;
 using static Content.Shared.Administration.AdminLogsEuiMsg;
 
 namespace Content.Client.Administration.UI.Logs;
@@ -11,28 +15,54 @@ namespace Content.Client.Administration.UI.Logs;
 [UsedImplicitly]
 public class AdminLogsEui : BaseEui
 {
+    [Dependency] private readonly IClyde _clyde = default!;
+    [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+
     public AdminLogsEui()
     {
-        Window = new AdminLogsWindow();
-        Window.OnClose += () => SendMessage(new Close());
-        Window.LogSearch.OnTextEntered += _ => RequestLogs();
-        Window.RefreshButton.OnPressed += _ => RequestLogs();
-        Window.NextButton.OnPressed += _ => NextLogs();
+        var monitor = _clyde.EnumerateMonitors().First();
+
+        ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
+        {
+            Maximized = true,
+            Title = "Admin Logs",
+            Monitor = monitor
+        });
+
+        ClydeWindow.RequestClosed += OnRequestClosed;
+        ClydeWindow.DisposeOnClose = true;
+
+        LogsWindow = new AdminLogsWindow();
+        LogsWindow.LogSearch.OnTextEntered += _ => RequestLogs();
+        LogsWindow.RefreshButton.OnPressed += _ => RequestLogs();
+        LogsWindow.NextButton.OnPressed += _ => NextLogs();
+
+        Root = _uiManager.CreateWindowRoot(ClydeWindow);
+        Root.AddChild(LogsWindow);
     }
 
-    private AdminLogsWindow Window { get; }
+    private WindowRoot Root { get; }
+
+    private IClydeWindow ClydeWindow { get; }
+
+    private AdminLogsWindow LogsWindow { get; }
 
     private bool FirstState { get; set; } = true;
 
+    private void OnRequestClosed(WindowRequestClosedEventArgs args)
+    {
+        SendMessage(new Close());
+    }
+
     private void RequestLogs()
     {
         var request = new LogsRequest(
-            Window.SelectedRoundId,
-            Window.SelectedTypes.ToList(),
+            LogsWindow.SelectedRoundId,
+            LogsWindow.SelectedTypes.ToList(),
             null,
             null,
             null,
-            Window.SelectedPlayers.ToArray(),
+            LogsWindow.SelectedPlayers.ToArray(),
             null,
             null,
             DateOrder.Descending);
@@ -54,16 +84,11 @@ public class AdminLogsEui : BaseEui
         }
 
         FirstState = false;
-        Window.SetCurrentRound(state.RoundId);
-        Window.SetRoundSpinBox(state.RoundId);
+        LogsWindow.SetCurrentRound(state.RoundId);
+        LogsWindow.SetRoundSpinBox(state.RoundId);
         return true;
     }
 
-    public override void Opened()
-    {
-        Window.OpenCentered();
-    }
-
     public override void HandleState(EuiStateBase state)
     {
         var s = (AdminLogsEuiState) state;
@@ -75,8 +100,8 @@ public class AdminLogsEui : BaseEui
             return;
         }
 
-        Window.SetCurrentRound(s.RoundId);
-        Window.SetPlayers(s.Players);
+        LogsWindow.SetCurrentRound(s.RoundId);
+        LogsWindow.SetPlayers(s.Players);
 
         if (first)
         {
@@ -91,10 +116,10 @@ public class AdminLogsEui : BaseEui
         switch (msg)
         {
             case NewLogs {Replace: true} newLogs:
-                Window.SetLogs(newLogs.Logs);
+                LogsWindow.SetLogs(newLogs.Logs);
                 break;
             case NewLogs {Replace: false} newLogs:
-                Window.AddLogs(newLogs.Logs);
+                LogsWindow.AddLogs(newLogs.Logs);
                 break;
         }
     }
@@ -103,7 +128,10 @@ public class AdminLogsEui : BaseEui
     {
         base.Closed();
 
-        Window.Close();
-        Window.Dispose();
+        ClydeWindow.RequestClosed -= OnRequestClosed;
+
+        LogsWindow.Dispose();
+        Root.Dispose();
+        ClydeWindow.Dispose();
     }
 }
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
index 1b47d0ee02..c52e9d8076 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
+++ b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
@@ -1,59 +1,64 @@
-<SS14Window xmlns="https://spacestation14.io"
+<Control xmlns="https://spacestation14.io"
             xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls"
-            Title="{Loc admin-logs-title}"
+            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             MinWidth="1000"
             MinHeight="400">
-    <BoxContainer Orientation="Horizontal">
-        <BoxContainer Orientation="Vertical">
-            <BoxContainer Orientation="Horizontal" MinWidth="400">
-                <Label Text="{Loc admin-logs-round}"/>
-                <SpinBox Name="RoundSpinBox" Value="0" MinWidth="150"/>
-                <Control HorizontalExpand="True"/>
-                <Button Name="ResetRoundButton" Text="{Loc admin-logs-reset}" HorizontalAlignment="Right"
-                        StyleClasses="OpenRight"/>
+    <PanelContainer>
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BackgroundColor="#25252add"/>
+        </PanelContainer.PanelOverride>
+        <BoxContainer Orientation="Horizontal">
+            <BoxContainer Orientation="Vertical">
+                <BoxContainer Orientation="Horizontal" MinWidth="400">
+                    <Label Text="{Loc admin-logs-round}"/>
+                    <SpinBox Name="RoundSpinBox" Value="0" MinWidth="150"/>
+                    <Control HorizontalExpand="True"/>
+                    <Button Name="ResetRoundButton" Text="{Loc admin-logs-reset}" HorizontalAlignment="Right"
+                            StyleClasses="OpenRight"/>
+                </BoxContainer>
+                <BoxContainer Orientation="Horizontal" VerticalExpand="True">
+                    <BoxContainer Orientation="Vertical" MinWidth="200">
+                        <LineEdit Name="TypeSearch" Access="Public" StyleClasses="actionSearchBox"
+                                  HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-types-placeholder}"/>
+                        <BoxContainer Orientation="Horizontal">
+                            <Button Name="SelectAllTypesButton" Text="{Loc admin-logs-select-all}"
+                                    MinWidth="100" StyleClasses="ButtonSquare"/>
+                            <Button Name="SelectNoTypesButton" Text="{Loc admin-logs-select-none}"
+                                    MinWidth="100" StyleClasses="ButtonSquare"/>
+                        </BoxContainer>
+                        <ScrollContainer VerticalExpand="True">
+                            <BoxContainer Name="TypesContainer" Access="Public" Orientation="Vertical"/>
+                        </ScrollContainer>
+                    </BoxContainer>
+                    <aui:VSeparator/>
+                    <BoxContainer Orientation="Vertical" MinWidth="200">
+                        <LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox"
+                                  HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
+                        <BoxContainer Orientation="Horizontal">
+                            <Button Name="SelectAllPlayersButton" Text="{Loc admin-logs-select-all}"
+                                    MinWidth="100" StyleClasses="ButtonSquare" />
+                            <Button Name="SelectNoPlayersButton" Text="{Loc admin-logs-select-none}"
+                                    MinWidth="100" StyleClasses="ButtonSquare"/>
+                        </BoxContainer>
+                        <ScrollContainer VerticalExpand="True">
+                            <BoxContainer Name="PlayersContainer" Access="Public" Orientation="Vertical"/>
+                        </ScrollContainer>
+                    </BoxContainer>
+                    <aui:VSeparator/>
+                </BoxContainer>
             </BoxContainer>
-            <BoxContainer Orientation="Horizontal" VerticalExpand="True">
-                <BoxContainer Orientation="Vertical" MinWidth="200">
-                    <LineEdit Name="TypeSearch" Access="Public" StyleClasses="actionSearchBox"
-                              HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-types-placeholder}"/>
-                    <BoxContainer Orientation="Horizontal">
-                        <Button Name="SelectAllTypesButton" Text="{Loc admin-logs-select-all}"
-                                MinWidth="100" StyleClasses="ButtonSquare"/>
-                        <Button Name="SelectNoTypesButton" Text="{Loc admin-logs-select-none}"
-                                MinWidth="100" StyleClasses="ButtonSquare"/>
-                    </BoxContainer>
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="TypesContainer" Access="Public" Orientation="Vertical"/>
-                    </ScrollContainer>
+            <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+                <BoxContainer Name="LogImpactContainer" Orientation="Horizontal"/>
+                <BoxContainer Orientation="Horizontal">
+                    <LineEdit Name="LogSearch" Access="Public" StyleClasses="actionSearchBox"
+                              HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-logs-placeholder}"/>
+                    <Button Name="RefreshButton" Access="Public" Text="{Loc admin-logs-refresh}" StyleClasses="ButtonSquare"/>
+                    <Button Name="NextButton" Access="Public" Text="{Loc admin-logs-next}" StyleClasses="OpenLeft"/>
                 </BoxContainer>
-                <aui:VSeparator/>
-                <BoxContainer Orientation="Vertical" MinWidth="200">
-                    <LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox"
-                              HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
-                    <BoxContainer Orientation="Horizontal">
-                        <Button Name="SelectAllPlayersButton" Text="{Loc admin-logs-select-all}"
-                                MinWidth="100" StyleClasses="ButtonSquare"></Button>
-                        <Button Name="SelectNoPlayersButton" Text="{Loc admin-logs-select-none}"
-                                MinWidth="100" StyleClasses="ButtonSquare"/>
-                    </BoxContainer>
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="PlayersContainer" Access="Public" Orientation="Vertical"/>
-                    </ScrollContainer>
-                </BoxContainer>
-                <aui:VSeparator/>
+                <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
+                    <BoxContainer Name="LogsContainer" Access="Public" Orientation="Vertical" VerticalExpand="True"/>
+                </ScrollContainer>
             </BoxContainer>
         </BoxContainer>
-        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-            <BoxContainer Name="LogImpactContainer" Orientation="Horizontal"/>
-            <BoxContainer Orientation="Horizontal">
-                <LineEdit Name="LogSearch" Access="Public" StyleClasses="actionSearchBox"
-                          HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-logs-placeholder}"/>
-                <Button Name="RefreshButton" Access="Public" Text="{Loc admin-logs-refresh}" StyleClasses="ButtonSquare"/>
-                <Button Name="NextButton" Access="Public" Text="{Loc admin-logs-next}" StyleClasses="OpenLeft"/>
-            </BoxContainer>
-            <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
-                <BoxContainer Name="LogsContainer" Access="Public" Orientation="Vertical" VerticalExpand="True"/>
-            </ScrollContainer>
-        </BoxContainer>
-    </BoxContainer>
-</SS14Window>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
index 1c8a5cca04..7f589ea415 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
@@ -5,8 +5,8 @@ using Content.Client.Administration.UI.CustomControls;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Localization;
 using static Robust.Client.UserInterface.Controls.BaseButton;
@@ -15,7 +15,7 @@ using static Robust.Client.UserInterface.Controls.LineEdit;
 namespace Content.Client.Administration.UI.Logs;
 
 [GenerateTypedNameReferences]
-public partial class AdminLogsWindow : SS14Window
+public partial class AdminLogsWindow : Control
 {
     private readonly Comparer<AdminLogTypeButton> _adminLogTypeButtonComparer =
         Comparer<AdminLogTypeButton>.Create((a, b) =>