Merge branch 'development' into development

lepoco · Jun 10, 2024 · ff35a07 · ff35a07
2 parents f391c61 + ba8a241
commit ff35a07
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/docs/documentation/themes.md b/docs/documentation/themes.md
@@ -46,7 +46,7 @@ Wpf.Ui.Appearance.ApplicationThemeManager.Apply(
 
 ### Automatic change
 
-The theme can be changed automatically when the operating system changes its background or accent using the [Watcher](https://github.com/lepoco/wpfui/blob/main/src/Wpf.Ui/Appearance/Watcher.cs) class.
+The theme can be changed automatically when the operating system changes its background or accent using the [SystemThemeWatcher](https://github.com/lepoco/wpfui/blob/main/src/Wpf.Ui/Appearance/SystemThemeWatcher.cs) class.
 
 ```csharp
 namespace MyApp;

diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.cs b/src/Wpf.Ui/Controls/TextBox/TextBox.cs
@@ -45,15 +45,16 @@ public class TextBox : System.Windows.Controls.TextBox
         nameof(PlaceholderEnabled),
         typeof(bool),
         typeof(TextBox),
-        new PropertyMetadata(true)
+        new PropertyMetadata(true, OnPlaceholderEnabledChanged)
     );
 
     /// <summary>Identifies the <see cref="CurrentPlaceholderEnabled"/> dependency property.</summary>
     public static readonly DependencyProperty CurrentPlaceholderEnabledProperty = DependencyProperty.Register(
         nameof(CurrentPlaceholderEnabled),
         typeof(bool),
         typeof(TextBox),
-        new PropertyMetadata(true));
+        new PropertyMetadata(true)
+    );
 
     /// <summary>Identifies the <see cref="ClearButtonEnabled"/> dependency property.</summary>
     public static readonly DependencyProperty ClearButtonEnabledProperty = DependencyProperty.Register(
@@ -197,7 +198,7 @@ protected void SetPlaceholderTextVisibility()
                 SetCurrentValue(CurrentPlaceholderEnabledProperty, true);
             }
         }
-        else
+        else if (CurrentPlaceholderEnabled)
         {
             SetCurrentValue(CurrentPlaceholderEnabledProperty, false);
         }
@@ -263,4 +264,19 @@ protected virtual void OnTemplateButtonClick(string? parameter)
 
         OnClearButtonClick();
     }
+
+    private static void OnPlaceholderEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not TextBox control)
+        {
+            return;
+        }
+
+        control.OnPlaceholderEnabledChanged();
+    }
+
+    protected virtual void OnPlaceholderEnabledChanged()
+    {
+        SetPlaceholderTextVisibility();
+    }
 }