command for popup box toggle click

Author: ButchersBoy

MainDemo.Wpf/Buttons.xaml.cs

@@ -21,19 +21,14 @@ namespace MaterialDesignColors.WpfExample
     /// </summary>
     public partial class Buttons : UserControl
     {
-        private readonly ICommand _floatingActionDemoCommand;
-
         public Buttons()
         {
             InitializeComponent();
 
-            _floatingActionDemoCommand = new AnotherCommandImplementation(Execute);
+            FloatingActionDemoCommand = new AnotherCommandImplementation(Execute);
         }
 
-        public ICommand FloatingActionDemoCommand
-        {
-            get { return _floatingActionDemoCommand; }
-        }
+        public ICommand FloatingActionDemoCommand { get; }
 
         private void Execute(object o)
         {
@@ -42,7 +37,7 @@ private void Execute(object o)
 
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
 	    {
-			System.Diagnostics.Debug.WriteLine("Just checking we haven't suppressed the button.");
+            Console.WriteLine("Just checking we haven't suppressed the button.");
 		}
     }
 }

MaterialDesignThemes.Wpf/PopupBox.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -272,6 +273,27 @@ public PopupBoxPopupMode PopupMode
         /// </summary>
         public CustomPopupPlacementCallback PopupPlacementMethod => GetPopupPlacement;
 
+        /// <summary>
+        /// Event raised when the checked toggled content (if set) is clicked.
+        /// </summary>
+        public static readonly RoutedEvent ToggleCheckedContentClickEvent = EventManager.RegisterRoutedEvent("ToggleCheckedContentClick", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PopupBox));
+
+        /// <summary>
+        /// Event raised when the checked toggled content (if set) is clicked.
+        /// </summary>
+        [Category("Behavior")]
+        public event RoutedEventHandler ToggleCheckedContentClick { add { AddHandler(ToggleCheckedContentClickEvent, value); } remove { RemoveHandler(ToggleCheckedContentClickEvent, value); } }
+
+
+        /// <summary>
+        /// Raises <see cref="ToggleCheckedContentClickEvent"/>.
+        /// </summary>
+        protected virtual void OnToggleCheckedContentClick()
+        {
+            var newEvent = new RoutedEventArgs(ToggleCheckedContentClickEvent, this);
+            RaiseEvent(newEvent);
+        }
+
         public override void OnApplyTemplate()
         {
             if (_popup != null)
@@ -495,12 +517,16 @@ private void ToggleButtonOnPreviewMouseLeftButtonUp(object sender, MouseButtonEv
         {
             if (PopupMode == PopupBoxPopupMode.Click || !IsPopupOpen) return;
 
-            if (ToggleCheckedContent != null 
-                && ToggleCheckedContentCommand != null
-                && ToggleCheckedContentCommand.CanExecute(ToggleCheckedContentCommandParameter)
-                )
+            if (ToggleCheckedContent != null)
             {
-                ToggleCheckedContentCommand.Execute(ToggleCheckedContentCommandParameter);
+                OnToggleCheckedContentClick();
+
+                if (ToggleCheckedContentCommand != null
+                    && ToggleCheckedContentCommand.CanExecute(ToggleCheckedContentCommandParameter)
+                    )
+                {
+                    ToggleCheckedContentCommand.Execute(ToggleCheckedContentCommandParameter);
+                }
             }
 
             Close();