bring event naming more inline with WPF/Popup standards

Author: ButchersBoy

MainDemo.Wpf/Buttons.xaml

@@ -81,8 +81,8 @@
                                          PlacementMode="BottomAndAlignCentres"
                                          ToolTipService.Placement="Right"
                                          ToolTip="PopupBox, Style MaterialDesignMultiFloatingActionPopupBox"
-                                         OnPopupOpened="PopupBox_OnPopupOpened"
-                                         OnPopupClosed="PopupBox_OnPopupClosed">
+                                         Opened="PopupBox_OnOpened"
+                                         Closed="PopupBox_OnClosed">
                     <StackPanel>
                         <Button ToolTip="One">1</Button>
                         <Button ToolTip="Two">2</Button>

MainDemo.Wpf/Buttons.xaml.cs

@@ -40,12 +40,12 @@ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
             Console.WriteLine("Just checking we haven't suppressed the button.");
 		}
 
-        private void PopupBox_OnPopupOpened(object sender, RoutedEventArgs e)
+        private void PopupBox_OnOpened(object sender, RoutedEventArgs e)
         {
             Console.WriteLine("Just making sure the popup has opened.");
         }
 
-        private void PopupBox_OnPopupClosed(object sender, RoutedEventArgs e)
+        private void PopupBox_OnClosed(object sender, RoutedEventArgs e)
         {
             Console.WriteLine("Just making sure the popup has closed.");
         }

MaterialDesignThemes.Wpf/PopupBox.cs

@@ -242,31 +242,18 @@ private static void IsPopupOpenPropertyChangedCallback(DependencyObject dependen
                 else
                     Mouse.Capture(null);
             }
-
-            if (newValue)
-            {
-                var popupOpenedEventArgs = new RoutedEventArgs()
-                {
-                    RoutedEvent = OnPopupOpenedEvent,
-                    Source = popupBox
-                };
-                popupBox.RaiseEvent(popupOpenedEventArgs);
-            }
-            else
-            {
-                var popupClosedEventArgs = new RoutedEventArgs()
-                {
-                    RoutedEvent = OnPopupClosedEvent,
-                    Source = popupBox
-                };
-                popupBox.RaiseEvent(popupClosedEventArgs);
-            }
-            
+                        
             popupBox.AnimateChildrenIn(!newValue);                 
             popupBox._popup?.RefreshPosition();
 
             VisualStateManager.GoToState(popupBox, newValue ? PopupIsOpenStateName : PopupIsClosedStateName, true);
-        }        
+
+            if (newValue)
+                popupBox.OnOpened();
+            else
+                popupBox.OnClosed();
+
+        }
 
         /// <summary>
         /// Gets or sets whether the popup is currently open.
@@ -275,46 +262,7 @@ public bool IsPopupOpen
         {
             get { return (bool) GetValue(IsPopupOpenProperty); }
             set { SetValue(IsPopupOpenProperty, value); }
-        }
-
-        /// <summary>
-        /// Event corresponds to the popup opening
-        /// </summary>
-        public static readonly RoutedEvent OnPopupOpenedEvent = 
-            EventManager.RegisterRoutedEvent(
-                "OnPopupOpened", 
-                RoutingStrategy.Bubble, 
-                typeof(RoutedEventHandler), 
-                typeof(PopupBox));
-
-        /// <summary>
-        /// Event corresponds to the popup closing
-        /// </summary>
-        public static readonly RoutedEvent OnPopupClosedEvent = 
-            EventManager.RegisterRoutedEvent(
-                "OnPopupClosed", 
-                RoutingStrategy.Bubble, 
-                typeof(RoutedEventHandler), 
-                typeof(PopupBox));
-
-        /// <summary>
-        /// Add / Remove OnPopupOpenedEvent handler 
-        /// </summary>
-        public event RoutedEventHandler OnPopupOpened
-        {
-            add { AddHandler(OnPopupOpenedEvent, value); }
-            remove { RemoveHandler(OnPopupOpenedEvent, value); }
-        }
-
-        /// <summary>
-        /// Add / Remove OnPopupClosedEvent handler 
-        /// </summary>
-        public event RoutedEventHandler OnPopupClosed
-        {
-            add { AddHandler(OnPopupClosedEvent, value); }
-            remove { RemoveHandler(OnPopupClosedEvent, value); }
-        }
-
+        }        
 
         public static readonly DependencyProperty StaysOpenProperty = DependencyProperty.Register(
             nameof(StaysOpen), typeof (bool), typeof (PopupBox), new PropertyMetadata(default(bool)));
@@ -388,7 +336,6 @@ public Orientation UnfurlOrientation
         [Category("Behavior")]
         public event RoutedEventHandler ToggleCheckedContentClick { add { AddHandler(ToggleCheckedContentClickEvent, value); } remove { RemoveHandler(ToggleCheckedContentClickEvent, value); } }
 
-
         /// <summary>
         /// Raises <see cref="ToggleCheckedContentClickEvent"/>.
         /// </summary>
@@ -398,6 +345,56 @@ protected virtual void OnToggleCheckedContentClick()
             RaiseEvent(newEvent);
         }
 
+        public static readonly RoutedEvent OpenedEvent =
+            EventManager.RegisterRoutedEvent(
+                "Opened",
+                RoutingStrategy.Bubble,
+                typeof(EventHandler),
+                typeof(PopupBox));
+
+        /// <summary>
+        /// Raised when the popup is opened.
+        /// </summary>
+        public event RoutedEventHandler Opened
+        {
+            add { AddHandler(OpenedEvent, value); }
+            remove { RemoveHandler(OpenedEvent, value); }
+        }
+
+        /// <summary>
+        /// Raises <see cref="OpenedEvent"/>.
+        /// </summary>
+        protected virtual void OnOpened()
+        {
+            var newEvent = new RoutedEventArgs(OpenedEvent, this);
+            RaiseEvent(newEvent);
+        }
+
+        public static readonly RoutedEvent ClosedEvent =
+            EventManager.RegisterRoutedEvent(
+                "Closed",
+                RoutingStrategy.Bubble,
+                typeof(EventHandler),
+                typeof(PopupBox));
+
+        /// <summary>
+        /// Raised when the popup is opened.
+        /// </summary>
+        public event RoutedEventHandler Closed
+        {
+            add { AddHandler(ClosedEvent, value); }
+            remove { RemoveHandler(ClosedEvent, value); }
+        }
+
+        /// <summary>
+        /// Raises <see cref="ClosedEvent"/>.
+        /// </summary>
+        protected virtual void OnClosed()
+        {
+            var newEvent = new RoutedEventArgs(ClosedEvent, this);
+            RaiseEvent(newEvent);
+        }
+
         public override void OnApplyTemplate()
         {
             if (_popup != null)