Resizeable changelog (#19272)

diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index c7bbed657c020a67e2bf99ddb3ba4a9b403f2e05..888a8528d91a1e9bde6a177b954ba8adc1bd83c8 100644 (file)
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -1,22 +1,17 @@
-<changelog:ChangelogWindow xmlns="https://spacestation14.io"
-                           xmlns:changelog="clr-namespace:Content.Client.Changelog"
-                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                           SetSize="500 400" MouseFilter="Stop">
+<ui:ChangelogWindow xmlns="https://spacestation14.io"
+                    xmlns:ui="clr-namespace:Content.Client.Changelog"
+                    Title="{Loc 'changelog-window-title'}"
+                    MinSize="500 400"
+                    SetSize="500 400">
+
     <PanelContainer StyleClasses="AngleRect" />
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Horizontal">
-            <Label Margin="6 0 0 0" HorizontalExpand="True" Text="{Loc 'changelog-window-title'}" VAlign="Center"
-                   StyleClasses="LabelHeading" />
-            <TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton"
-                           VerticalAlignment="Center" />
-        </BoxContainer>
-        <controls:HighDivider />
 
-        <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
+        <ScrollContainer Margin="5" VerticalExpand="True" HScrollEnabled="False">
             <BoxContainer Orientation="Vertical" Name="ChangelogBody" />
         </ScrollContainer>
 
         <PanelContainer StyleClasses="LowDivider" />
         <Label Name="VersionLabel" HorizontalAlignment="Right" StyleClasses="LabelSubText" Margin="4 0" />
     </BoxContainer>
-</changelog:ChangelogWindow>
+</ui:ChangelogWindow>

diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index a552dc9d1fb7ea3f716848fdc15fdae3c9c05eb6..cea5bd9e7c2f5618a6ba3143766b6ad2ad0bb53e 100644 (file)
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using System.Numerics;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.EscapeMenu;
 using Content.Shared.Administration;
 using JetBrains.Annotations;
@@ -9,7 +10,6 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Console;
 using Robust.Shared.Utility;
@@ -19,18 +19,16 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 namespace Content.Client.Changelog
 {
     [GenerateTypedNameReferences]
-    public sealed partial class ChangelogWindow : BaseWindow
+    public sealed partial class ChangelogWindow : FancyWindow
     {
         [Dependency] private readonly ChangelogManager _changelog = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
 
         public ChangelogWindow()
         {
-            IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
-
+            WindowTitle.AddStyleClass(StyleBase.StyleClassLabelHeading);
             Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
-            CloseButton.OnPressed += _ => Close();
         }
 
         protected override void Opened()
@@ -72,7 +70,7 @@ namespace Content.Client.Changelog
                 ChangelogBody.AddChild(new Label
                 {
                     Text = dayNice,
-                    StyleClasses = {"LabelHeading"},
+                    StyleClasses = { StyleBase.StyleClassLabelHeading },
                     Margin = new Thickness(4, 6, 0, 0)
                 });
 
@@ -84,7 +82,7 @@ namespace Content.Client.Changelog
 
                     if (!first)
                     {
-                        ChangelogBody.AddChild(new Control {Margin = new Thickness(4)});
+                        ChangelogBody.AddChild(new Control { Margin = new Thickness(4) });
                     }
 
                     if (read && !hasRead)
@@ -131,7 +129,7 @@ namespace Content.Client.Changelog
                         };
 
                         readDivider.AddChild(hBox);
-                        readDivider.AddChild(new PanelContainer {StyleClasses = {"LowDivider"}});
+                        readDivider.AddChild(new PanelContainer { StyleClasses = { StyleBase.ClassLowDivider } });
                         ChangelogBody.AddChild(readDivider);
 
                         if (first)
@@ -190,11 +188,6 @@ namespace Content.Client.Changelog
                 ModulateSelfOverride = Color.FromHex(color)
             };
         }
-
-        protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
-        {
-            return DragMode.Move;
-        }
     }
 
     [UsedImplicitly, AnyCommand]