From 5fc9176ce7110030a96c728a46d1eb9e37765200 Mon Sep 17 00:00:00 2001 From: davevanegdom Date: Thu, 21 Sep 2023 23:18:46 +0200 Subject: [PATCH] Removed customization for "Normal" and "TextColor" --- Source/Editor/Editor.cs | 6 ++---- Source/Editor/GUI/StatusBar.cs | 2 +- Source/Editor/Modules/UIModule.cs | 5 ++--- Source/Editor/Options/OptionsModule.cs | 2 -- Source/Engine/Scripting/Scripting.cs | 2 -- Source/Engine/UI/GUI/Style.cs | 10 ---------- 6 files changed, 5 insertions(+), 22 deletions(-) diff --git a/Source/Editor/Editor.cs b/Source/Editor/Editor.cs index 308e40bc1..7f0359331 100644 --- a/Source/Editor/Editor.cs +++ b/Source/Editor/Editor.cs @@ -568,8 +568,7 @@ namespace FlaxEditor BackgroundColorSelected = Color.Transparent, BorderColorHighlighted = Color.Transparent, Text = "Save Now", - TooltipText = "Saves now and restarts the auto save timer.", - TextColor = Style.Current.Statusbar.TextColor + TooltipText = "Saves now and restarts the auto save timer." }; _saveNowButton.LocalX += 120; _saveNowButton.Clicked += () => _autoSaveNow = true; @@ -591,8 +590,7 @@ namespace FlaxEditor BackgroundColorSelected = Color.Transparent, BorderColorHighlighted = Color.Transparent, Text = "Cancel", - TooltipText = "Cancels this auto save.", - TextColor = Style.Current.Statusbar.TextColor + TooltipText = "Cancels this auto save." }; _cancelSaveButton.LocalX += 180; _cancelSaveButton.Clicked += () => diff --git a/Source/Editor/GUI/StatusBar.cs b/Source/Editor/GUI/StatusBar.cs index 93c8f7218..f8f7ae839 100644 --- a/Source/Editor/GUI/StatusBar.cs +++ b/Source/Editor/GUI/StatusBar.cs @@ -33,7 +33,7 @@ namespace FlaxEditor.GUI /// /// Gets or sets the status text color /// - public Color TextColor { get; set; } = Style.Current.Statusbar.TextColor; + public Color TextColor { get; set; } = Style.Current.Foreground; /// /// Initializes a new instance of the class. diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs index a4a96d075..69e610c07 100644 --- a/Source/Editor/Modules/UIModule.cs +++ b/Source/Editor/Modules/UIModule.cs @@ -281,7 +281,7 @@ namespace FlaxEditor.Modules if (Editor.StateMachine.IsPlayMode) color = Style.Current.Statusbar.PlayMode; else - color = Style.Current.Statusbar.Normal; + color = Style.Current.BackgroundSelected; string text; if (_statusMessages != null && _statusMessages.Count != 0) @@ -761,8 +761,7 @@ namespace FlaxEditor.Modules HorizontalAlignment = TextAlignment.Far, AnchorPreset = AnchorPresets.HorizontalStretchMiddle, Parent = progressPanel, - Offsets = new Margin(progressBarRightMargin, progressBarWidth + progressBarLeftMargin + progressBarRightMargin, 0, 0), - TextColor = Style.Current.Statusbar.TextColor + Offsets = new Margin(progressBarRightMargin, progressBarWidth + progressBarLeftMargin + progressBarRightMargin, 0, 0) }; UpdateStatusBar(); diff --git a/Source/Editor/Options/OptionsModule.cs b/Source/Editor/Options/OptionsModule.cs index 05a75fa4a..c2d744239 100644 --- a/Source/Editor/Options/OptionsModule.cs +++ b/Source/Editor/Options/OptionsModule.cs @@ -246,8 +246,6 @@ namespace FlaxEditor.Options Statusbar = new Style.StatusbarStyle() { - TextColor = Color.White, - Normal = Color.FromBgra(0xFF007ACC), PlayMode = Color.FromBgra(0xFF2F9135), Failed = Color.FromBgra(0xFF9C2424), Loading = Color.FromBgra(0xFF2D2D30) diff --git a/Source/Engine/Scripting/Scripting.cs b/Source/Engine/Scripting/Scripting.cs index 7e3226412..d43804586 100644 --- a/Source/Engine/Scripting/Scripting.cs +++ b/Source/Engine/Scripting/Scripting.cs @@ -279,8 +279,6 @@ namespace FlaxEngine SharedTooltip = new Tooltip(), Statusbar = new Style.StatusbarStyle() { - TextColor = Color.White, - Normal = Color.FromBgra(0xFF007ACC), PlayMode = Color.FromBgra(0xFF2F9135), Failed = Color.FromBgra(0xFF9C2424), Loading = Color.FromBgra(0xFF2D2D30) diff --git a/Source/Engine/UI/GUI/Style.cs b/Source/Engine/UI/GUI/Style.cs index c98c37b78..8f34a703c 100644 --- a/Source/Engine/UI/GUI/Style.cs +++ b/Source/Engine/UI/GUI/Style.cs @@ -254,16 +254,6 @@ namespace FlaxEngine.GUI [System.Serializable, ShowInEditor] public struct StatusbarStyle { - /// - /// Color of the text in the Statusbar - /// - public Color TextColor; - - /// - /// Color of the Statusbar in its default state - /// - public Color Normal; - /// /// Color of the Statusbar when in Play Mode ///