From f3372e93cbe2625a603a35835ad942741d3f262f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 26 Dec 2019 19:34:42 +0100 Subject: [PATCH] made format settings be non-struct-like --- MLEM.Ui/Elements/Paragraph.cs | 2 +- MLEM/Formatting/FormatSettings.cs | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/MLEM.Ui/Elements/Paragraph.cs b/MLEM.Ui/Elements/Paragraph.cs index d91d7cd..be66ea9 100644 --- a/MLEM.Ui/Elements/Paragraph.cs +++ b/MLEM.Ui/Elements/Paragraph.cs @@ -105,7 +105,7 @@ namespace MLEM.Ui.Elements { this.RegularFont.SetFromStyle(style.Font); this.BoldFont.SetFromStyle(style.BoldFont ?? style.Font); this.ItalicFont.SetFromStyle(style.ItalicFont ?? style.Font); - this.FormatSettings.SetFromStyle(style.FormatSettings ?? Formatting.FormatSettings.Default); + this.FormatSettings.SetFromStyle(style.FormatSettings); } public delegate string TextCallback(Paragraph paragraph); diff --git a/MLEM/Formatting/FormatSettings.cs b/MLEM/Formatting/FormatSettings.cs index cb17a70..c47892c 100644 --- a/MLEM/Formatting/FormatSettings.cs +++ b/MLEM/Formatting/FormatSettings.cs @@ -3,13 +3,7 @@ using Microsoft.Xna.Framework; namespace MLEM.Formatting { public class FormatSettings { - public static readonly FormatSettings Default = new FormatSettings { - WobbleModifier = 5, - WobbleHeightModifier = 1 / 8F, - TypingSpeed = 20, - DropShadowColor = Color.Black, - DropShadowOffset = new Vector2(2) - }; + public static readonly FormatSettings Default = new FormatSettings(); public float WobbleModifier; public float WobbleHeightModifier; @@ -17,5 +11,13 @@ namespace MLEM.Formatting { public Color DropShadowColor; public Vector2 DropShadowOffset; + public FormatSettings() { + this.WobbleModifier = 5; + this.WobbleHeightModifier = 1 / 8F; + this.TypingSpeed = 20; + this.DropShadowColor = Color.Black; + this.DropShadowOffset = new Vector2(2); + } + } } \ No newline at end of file