From 6d880d483bd948b9db05199f64ff87de4be47fd1 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Tue, 18 Apr 2023 16:18:47 +0200
Subject: [PATCH] fix Watermark not shown when having a custom watermark set

---
 src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
index c091d07632..90153d3293 100644
--- 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;