fix Watermark not shown when having a custom watermark set

3 years ago · 6d880d483b
1 changed files with 2 additions and 1 deletions
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
@ -875,10 +875,11 @@ namespace Avalonia.Controls
        {
            if (_textBox != null)
            {
+                SetCurrentValue(TextProperty, String.Empty);
+                
                if (string.IsNullOrEmpty(Watermark) && !UseFloatingWatermark)
                {
                    DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
-                    SetCurrentValue(TextProperty, string.Empty);
                    _defaultText = string.Empty;
                    var watermarkFormat = "<{0}>";
                    string watermarkText;