GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Removed customization for "Normal" and "TextColor"

Browse Source
This commit is contained in:
davevanegdom
2023-09-21 23:18:46 +02:00
parent 80a3bb2ae2
commit 5fc9176ce7
6 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/Editor.cs
View File

@@ -568,8 +568,7 @@ namespace FlaxEditor
BackgroundColorSelected = Color.Transparent, BackgroundColorSelected = Color.Transparent,
BorderColorHighlighted = Color.Transparent, BorderColorHighlighted = Color.Transparent,
Text = "Save Now", Text = "Save Now",
TooltipText = "Saves now and restarts the auto save timer.", TooltipText = "Saves now and restarts the auto save timer."
TextColor = Style.Current.Statusbar.TextColor
}; };
_saveNowButton.LocalX += 120; _saveNowButton.LocalX += 120;
_saveNowButton.Clicked += () => _autoSaveNow = true; _saveNowButton.Clicked += () => _autoSaveNow = true;
@@ -591,8 +590,7 @@ namespace FlaxEditor
BackgroundColorSelected = Color.Transparent, BackgroundColorSelected = Color.Transparent,
BorderColorHighlighted = Color.Transparent, BorderColorHighlighted = Color.Transparent,
Text = "Cancel", Text = "Cancel",
TooltipText = "Cancels this auto save.", TooltipText = "Cancels this auto save."
TextColor = Style.Current.Statusbar.TextColor
}; };
_cancelSaveButton.LocalX += 180; _cancelSaveButton.LocalX += 180;
_cancelSaveButton.Clicked += () => _cancelSaveButton.Clicked += () =>

2
Source/Editor/GUI/StatusBar.cs
View File

@@ -33,7 +33,7 @@ namespace FlaxEditor.GUI
/// <summary> /// <summary>
/// Gets or sets the status text color /// Gets or sets the status text color
/// </summary> /// </summary>
public Color TextColor { get; set; } = Style.Current.Statusbar.TextColor; public Color TextColor { get; set; } = Style.Current.Foreground;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="StatusBar"/> class. /// Initializes a new instance of the <see cref="StatusBar"/> class.

5
Source/Editor/Modules/UIModule.cs
View File

@@ -281,7 +281,7 @@ namespace FlaxEditor.Modules
if (Editor.StateMachine.IsPlayMode) if (Editor.StateMachine.IsPlayMode)
color = Style.Current.Statusbar.PlayMode; color = Style.Current.Statusbar.PlayMode;
else else
color = Style.Current.Statusbar.Normal; color = Style.Current.BackgroundSelected;
string text; string text;
if (_statusMessages != null && _statusMessages.Count != 0) if (_statusMessages != null && _statusMessages.Count != 0)
@@ -761,8 +761,7 @@ namespace FlaxEditor.Modules
HorizontalAlignment = TextAlignment.Far, HorizontalAlignment = TextAlignment.Far,
AnchorPreset = AnchorPresets.HorizontalStretchMiddle, AnchorPreset = AnchorPresets.HorizontalStretchMiddle,
Parent = progressPanel, Parent = progressPanel,
Offsets = new Margin(progressBarRightMargin, progressBarWidth + progressBarLeftMargin + progressBarRightMargin, 0, 0), Offsets = new Margin(progressBarRightMargin, progressBarWidth + progressBarLeftMargin + progressBarRightMargin, 0, 0)
TextColor = Style.Current.Statusbar.TextColor
}; };
UpdateStatusBar(); UpdateStatusBar();

2
Source/Editor/Options/OptionsModule.cs
View File

@@ -246,8 +246,6 @@ namespace FlaxEditor.Options
Statusbar = new Style.StatusbarStyle() Statusbar = new Style.StatusbarStyle()
{ {
TextColor = Color.White,
Normal = Color.FromBgra(0xFF007ACC),
PlayMode = Color.FromBgra(0xFF2F9135), PlayMode = Color.FromBgra(0xFF2F9135),
Failed = Color.FromBgra(0xFF9C2424), Failed = Color.FromBgra(0xFF9C2424),
Loading = Color.FromBgra(0xFF2D2D30) Loading = Color.FromBgra(0xFF2D2D30)

2
Source/Engine/Scripting/Scripting.cs
View File

@@ -279,8 +279,6 @@ namespace FlaxEngine
SharedTooltip = new Tooltip(), SharedTooltip = new Tooltip(),
Statusbar = new Style.StatusbarStyle() Statusbar = new Style.StatusbarStyle()
{ {
TextColor = Color.White,
Normal = Color.FromBgra(0xFF007ACC),
PlayMode = Color.FromBgra(0xFF2F9135), PlayMode = Color.FromBgra(0xFF2F9135),
Failed = Color.FromBgra(0xFF9C2424), Failed = Color.FromBgra(0xFF9C2424),
Loading = Color.FromBgra(0xFF2D2D30) Loading = Color.FromBgra(0xFF2D2D30)

10
Source/Engine/UI/GUI/Style.cs
View File

@@ -254,16 +254,6 @@ namespace FlaxEngine.GUI
[System.Serializable, ShowInEditor] [System.Serializable, ShowInEditor]
public struct StatusbarStyle public struct StatusbarStyle
{ {
/// <summary>
/// Color of the text in the Statusbar
/// </summary>
public Color TextColor;
/// <summary>
/// Color of the Statusbar in its default state
/// </summary>
public Color Normal;
/// <summary> /// <summary>
/// Color of the Statusbar when in Play Mode /// Color of the Statusbar when in Play Mode
/// </summary> /// </summary>