From 0215092016f25b7f76d5bc3d5ebcb610f5c65cc1 Mon Sep 17 00:00:00 2001 From: Hugal31 Date: Sat, 2 May 2020 23:20:12 +0200 Subject: [PATCH] Add a style to the popup messages (#867) --- Content.Client/ClientNotifyManager.cs | 7 ++++++- Content.Client/UserInterface/Stylesheets/StyleNano.cs | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Content.Client/ClientNotifyManager.cs b/Content.Client/ClientNotifyManager.cs index 1370dcca16..867bee8144 100644 --- a/Content.Client/ClientNotifyManager.cs +++ b/Content.Client/ClientNotifyManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Content.Client.Interfaces; +using Content.Client.UserInterface.Stylesheets; using Content.Shared; using Robust.Client.Interfaces.Console; using Robust.Client.Interfaces.Graphics.ClientEye; @@ -57,7 +58,11 @@ namespace Content.Client public void PopupMessage(ScreenCoordinates coordinates, string message) { - var label = new PopupLabel {Text = message}; + var label = new PopupLabel + { + Text = message, + StyleClasses = { StyleNano.StyleClassPopupMessage }, + }; var minimumSize = label.CombinedMinimumSize; LayoutContainer.SetPosition(label, label.InitialPos = coordinates.Position - minimumSize / 2); _userInterfaceManager.PopupRoot.AddChild(label); diff --git a/Content.Client/UserInterface/Stylesheets/StyleNano.cs b/Content.Client/UserInterface/Stylesheets/StyleNano.cs index e182012a55..a96413b9d0 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleNano.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleNano.cs @@ -21,6 +21,7 @@ namespace Content.Client.UserInterface.Stylesheets public const string StyleClassLabelSecondaryColor = "LabelSecondaryColor"; public const string StyleClassLabelBig = "LabelBig"; public const string StyleClassButtonBig = "ButtonBig"; + public const string StyleClassPopupMessage = "PopupMessage"; public static readonly Color NanoGold = Color.FromHex("#A88B5E"); @@ -41,6 +42,7 @@ namespace Content.Client.UserInterface.Stylesheets public StyleNano(IResourceCache resCache) : base(resCache) { var notoSans10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 10); + var notoSansItalic10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Italic.ttf", 10); var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12); var notoSansBold12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 12); var notoSansDisplayBold14 = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 14); @@ -552,6 +554,14 @@ namespace Content.Client.UserInterface.Stylesheets new StyleProperty("font", notoSans16) }), + // Popup messages + new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassPopupMessage}, null, null), + new[] + { + new StyleProperty("font", notoSansItalic10), + new StyleProperty("font-color", Color.LightGray), + }), + //APC and SMES power state label colors new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassPowerStateNone}, null, null), new[] {