push selection change events behind text events, so hit proxy can query current state better, fixing issue with hint colouring. #532

Author: ButchersBoy

MaterialDesignThemes.Wpf/HintProxyFabric.ComboBox.cs

@@ -16,6 +16,18 @@ private sealed class ComboBoxHintProxy : IHintProxy
  private readonly ComboBox _comboBox;
  private readonly TextChangedEventHandler _comboBoxTextChangedEventHandler;
 
+ public ComboBoxHintProxy(ComboBox comboBox)
+ {
+ if (comboBox == null) throw new ArgumentNullException(nameof(comboBox));
+
+ _comboBox = comboBox;
+ _comboBoxTextChangedEventHandler = ComboBoxTextChanged;
+ _comboBox.AddHandler(TextBoxBase.TextChangedEvent, _comboBoxTextChangedEventHandler);
+ _comboBox.SelectionChanged += ComboBoxSelectionChanged;
+ _comboBox.Loaded += ComboBoxLoaded;
+ _comboBox.IsVisibleChanged += ComboBoxIsVisibleChanged;
+ }
+
  public object Content
  {
  get
@@ -47,21 +59,9 @@ public bool IsEmpty()
 
  public event EventHandler Loaded;
 
- public ComboBoxHintProxy(ComboBox comboBox)
- {
- if (comboBox == null) throw new ArgumentNullException(nameof(comboBox));
-
- _comboBox = comboBox;
- _comboBoxTextChangedEventHandler = new TextChangedEventHandler(ComboBoxTextChanged);
- _comboBox.AddHandler(TextBoxBase.TextChangedEvent, _comboBoxTextChangedEventHandler);
- _comboBox.SelectionChanged += ComboBoxSelectionChanged;
- _comboBox.Loaded += ComboBoxLoaded;
- _comboBox.IsVisibleChanged += ComboBoxIsVisibleChanged;
- }
-
  private void ComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
  {
- ContentChanged?.Invoke(sender, EventArgs.Empty);
+ _comboBox.Dispatcher.InvokeAsync(() => ContentChanged?.Invoke(sender, EventArgs.Empty));
  }
 
  private void ComboBoxIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)

MaterialDesignThemes.Wpf/SmartHint.cs

@@ -52,13 +52,18 @@ public object Hint
 
  #region IsContentNullOrEmpty
 
- public static readonly DependencyProperty IsContentNullOrEmptyProperty = DependencyProperty.Register(
- nameof(IsContentNullOrEmpty), typeof(bool), typeof(SmartHint), new PropertyMetadata(default(bool)));
+ private static readonly DependencyPropertyKey IsContentNullOrEmptyPropertyKey =
+ DependencyProperty.RegisterReadOnly(
+ "IsContentNullOrEmpty", typeof(bool), typeof(SmartHint),
+ new PropertyMetadata(default(bool)));
+
+ public static readonly DependencyProperty IsContentNullOrEmptyProperty =
+ IsContentNullOrEmptyPropertyKey.DependencyProperty;
 
  public bool IsContentNullOrEmpty
  {
- get { return (bool)GetValue(IsContentNullOrEmptyProperty); }
- set { SetValue(IsContentNullOrEmptyProperty, value); }
+ get { return (bool) GetValue(IsContentNullOrEmptyProperty); }
+ private set { SetValue(IsContentNullOrEmptyPropertyKey, value); }
  }
 
  #endregion