From 47eb085d64c4d2359226e3fb93de2f336b4e68c9 Mon Sep 17 00:00:00 2001 From: Thomas Freudenberg Date: Thu, 12 Feb 2015 15:40:52 +0100 Subject: [PATCH] subscribe to clear button even if control is already loaded. Fixes #1764 --- MahApps.Metro/Controls/Helper/TextBoxHelper.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/MahApps.Metro/Controls/Helper/TextBoxHelper.cs b/MahApps.Metro/Controls/Helper/TextBoxHelper.cs index 1b783f1d0e..8c64610999 100644 --- a/MahApps.Metro/Controls/Helper/TextBoxHelper.cs +++ b/MahApps.Metro/Controls/Helper/TextBoxHelper.cs @@ -374,6 +374,10 @@ private static void ButtonCommandOrClearTextChanged(DependencyObject d, Dependen // only one loaded event textbox.Loaded -= TextBoxLoaded; textbox.Loaded += TextBoxLoaded; + if (textbox.IsLoaded) + { + TextBoxLoaded(textbox, new RoutedEventArgs()); + } } var passbox = d as PasswordBox; if (passbox != null) @@ -381,6 +385,10 @@ private static void ButtonCommandOrClearTextChanged(DependencyObject d, Dependen // only one loaded event passbox.Loaded -= PassBoxLoaded; passbox.Loaded += PassBoxLoaded; + if (passbox.IsLoaded) + { + PassBoxLoaded(passbox, new RoutedEventArgs()); + } } var combobox = d as ComboBox; if (combobox != null) @@ -388,6 +396,10 @@ private static void ButtonCommandOrClearTextChanged(DependencyObject d, Dependen // only one loaded event combobox.Loaded -= ComboBoxLoaded; combobox.Loaded += ComboBoxLoaded; + if (combobox.IsLoaded) + { + ComboBoxLoaded(combobox, new RoutedEventArgs()); + } } }