Improving debug messages

fluentribbon · Aug 25, 2018 · c5f8820 · c5f8820
1 parent 0a1d9c4
commit c5f8820
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Fluent.Ribbon/Services/PopupService.cs b/Fluent.Ribbon/Services/PopupService.cs
@@ -7,7 +7,6 @@ namespace Fluent
     using System.Windows.Controls;
     using System.Windows.Controls.Primitives;
     using System.Windows.Input;
-    using System.Windows.Threading;
     using Fluent.Extensions;
     using Fluent.Internal;
 
@@ -87,7 +86,7 @@ public static void RaiseDismissPopupEventAsync(object sender, DismissPopupMode m
                 return;
             }
 
-            Debug.WriteLine($"Dismissing Popup ({mode}, async)");
+            Debug.WriteLine($"Dismissing Popup async (Mode = {mode}, Sender = {sender})");
 
             element.RunInDispatcherAsync(() => RaiseDismissPopupEvent(sender, mode));
         }
@@ -104,7 +103,7 @@ public static void RaiseDismissPopupEvent(object sender, DismissPopupMode mode)
                 return;
             }
 
-            Debug.WriteLine($"Dismissing Popup ({mode})");
+            Debug.WriteLine($"Dismissing Popup (Mode = {mode}, Sender = {sender})");
 
             element.RaiseEvent(new DismissPopupEventArgs(mode));
         }
@@ -129,7 +128,10 @@ public static void Attach(Type classType)
         /// </summary>
         public static void OnClickThroughThunk(object sender, MouseButtonEventArgs e)
         {
-            ////Debug.WriteLine(string.Format("OnClickThroughThunk: sender = {0}; originalSource = {1}; mouse capture = {2}", sender, e.OriginalSource, Mouse.Captured));
+            Debug.WriteLine(nameof(OnClickThroughThunk));
+            Debug.WriteLine($"Sender         - {sender}");
+            Debug.WriteLine($"OriginalSource - {e.OriginalSource}");
+            Debug.WriteLine($"Mouse.Captured - {Mouse.Captured}");
 
             if (e.ChangedButton == MouseButton.Left
                 || e.ChangedButton == MouseButton.Right)
@@ -165,7 +167,7 @@ public static void OnClickThroughThunk(object sender, MouseButtonEventArgs e)
         /// </summary>
         public static void OnLostMouseCapture(object sender, MouseEventArgs e)
         {
-            Debug.WriteLine($"OnLostMouseCapture");
+            Debug.WriteLine(nameof(OnLostMouseCapture));
             Debug.WriteLine($"Sender         - {sender}");
             Debug.WriteLine($"OriginalSource - {e.OriginalSource}");
             Debug.WriteLine($"Mouse.Captured - {Mouse.Captured}");