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

Fix missing default value of localized string in editor

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-02 18:02:34 +02:00
parent fa89e710d8
commit fd8a8b5a4d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/CustomEditors/Editors/StringEditor.cs
View File

@@ -35,7 +35,7 @@ namespace FlaxEditor.CustomEditors.Editors
} }
_element = layout.TextBox(isMultiLine); _element = layout.TextBox(isMultiLine);
_defaultWatermarkColor = _element.TextBox.WatermarkTextColor; _watermarkColor = _defaultWatermarkColor = _element.TextBox.WatermarkTextColor;
if (watermarkAttribute is WatermarkAttribute watermark) if (watermarkAttribute is WatermarkAttribute watermark)
{ {
_watermarkText = watermark.WatermarkText; _watermarkText = watermark.WatermarkText;

8
Source/Engine/UI/GUI/Common/TextBox.cs
View File

@@ -298,9 +298,13 @@ namespace FlaxEngine.GUI
color *= 0.85f; color *= 0.85f;
Render2D.DrawText(font, text, color, ref _layout, TextMaterial); Render2D.DrawText(font, text, color, ref _layout, TextMaterial);
} }
else if (!string.IsNullOrEmpty(_watermarkText)) else
{ {
Render2D.DrawText(font, _watermarkText, WatermarkTextColor, ref _layout, TextMaterial); text = _watermarkText;
if (text.Length > 0)
{
Render2D.DrawText(font, _watermarkText, WatermarkTextColor, ref _layout, TextMaterial);
}
} }
// Caret // Caret