Browse Source
Merge branch 'master' into fixes/textIssues
pull/11034/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
1 deletions
-
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; |
|
|
|
|
