Fix #60

Kinnara · Apr 14, 2020 · 240e043 · 240e043
1 parent 8f0f49e
commit 240e043
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs
@@ -56,6 +56,14 @@ public ToggleSwitch()
             IsEnabledChanged += OnIsEnabledChanged;
         }
 
+        public static readonly RoutedEvent ToggledEvent = EventManager.RegisterRoutedEvent(nameof(Toggled), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ToggleSwitch));
+
+        public event RoutedEventHandler Toggled
+        {
+            add { AddHandler(ToggledEvent, value); }
+            remove { RemoveHandler(ToggledEvent, value); }
+        }
+
         #region Header
 
         public object Header
@@ -261,8 +269,6 @@ public CornerRadius CornerRadius
 
         private Thumb SwitchThumb { get; set; }
 
-        public event RoutedEventHandler Toggled;
-
         public override void OnApplyTemplate()
         {
             if (SwitchKnobBounds != null &&
@@ -311,7 +317,7 @@ public override void OnApplyTemplate()
 
         protected virtual void OnToggled()
         {
-            Toggled?.Invoke(this, new RoutedEventArgs());
+            RaiseEvent(new RoutedEventArgs(ToggledEvent));
         }
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)