From dbd21f1295f6ee2a1fbe2b59f171c4b887f7c2a2 Mon Sep 17 00:00:00 2001 From: y7o4ka <56449763+4310V343k@users.noreply.github.com> Date: Sat, 23 Sep 2023 05:35:53 +0300 Subject: [PATCH] Resizeable changelog (#19272) --- Content.Client/Changelog/ChangelogWindow.xaml | 21 +++++++------------ .../Changelog/ChangelogWindow.xaml.cs | 19 ++++++----------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml index c7bbed657c..888a8528d9 100644 --- a/Content.Client/Changelog/ChangelogWindow.xaml +++ b/Content.Client/Changelog/ChangelogWindow.xaml @@ -1,22 +1,17 @@ - + + - - - - + - + diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs index a552dc9d1f..cea5bd9e7c 100644 --- 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().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]