From fd8a8b5a4dd9cde88d3da8b47633758c989d9e9f Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 2 Jun 2025 18:02:34 +0200 Subject: [PATCH] Fix missing default value of localized string in editor --- Source/Editor/CustomEditors/Editors/StringEditor.cs | 2 +- Source/Engine/UI/GUI/Common/TextBox.cs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/StringEditor.cs b/Source/Editor/CustomEditors/Editors/StringEditor.cs index 12cd29b8b..7eaf26186 100644 --- a/Source/Editor/CustomEditors/Editors/StringEditor.cs +++ b/Source/Editor/CustomEditors/Editors/StringEditor.cs @@ -35,7 +35,7 @@ namespace FlaxEditor.CustomEditors.Editors } _element = layout.TextBox(isMultiLine); - _defaultWatermarkColor = _element.TextBox.WatermarkTextColor; + _watermarkColor = _defaultWatermarkColor = _element.TextBox.WatermarkTextColor; if (watermarkAttribute is WatermarkAttribute watermark) { _watermarkText = watermark.WatermarkText; diff --git a/Source/Engine/UI/GUI/Common/TextBox.cs b/Source/Engine/UI/GUI/Common/TextBox.cs index 76727cc07..9ee052581 100644 --- a/Source/Engine/UI/GUI/Common/TextBox.cs +++ b/Source/Engine/UI/GUI/Common/TextBox.cs @@ -298,9 +298,13 @@ namespace FlaxEngine.GUI color *= 0.85f; 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