From 6901fe07d747b3bc22deee8b52068e1469b7d796 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 21 Jan 2022 21:33:32 -0500 Subject: [PATCH] Add some mouse events to WPFTracer --- .../view/Extensions/UIElementExtensions.cs | 15 ++++++ src/client/spark/view/Utility/WPFTracer.cs | 47 +++++++++++++++++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/src/client/spark/view/Extensions/UIElementExtensions.cs b/src/client/spark/view/Extensions/UIElementExtensions.cs index 0bde3b880..1bed350a7 100644 --- a/src/client/spark/view/Extensions/UIElementExtensions.cs +++ b/src/client/spark/view/Extensions/UIElementExtensions.cs @@ -133,6 +133,11 @@ namespace mbts.ui.extensions { return Disposable.Create(() => target.MouseLeftButtonDown -= callback); } + public static IDisposable SubscribeMouseRightButtonDown(this UIElement target, MouseButtonEventHandler callback) { + target.MouseRightButtonDown += callback; + return Disposable.Create(() => target.MouseRightButtonDown -= callback); + } + public static IDisposable SubscribeMouseLeftButtonUp(this UIElement target, MouseButtonEventHandler callback) { target.MouseLeftButtonUp += callback; return Disposable.Create(() => target.MouseLeftButtonUp -= callback); @@ -256,6 +261,16 @@ namespace mbts.ui.extensions { return Disposable.Create(() => target.PreviewLostKeyboardFocus -= callback); } + public static IDisposable SubscribePreviewMouseLeftButtonDown(this UIElement target, MouseButtonEventHandler callback) { + target.PreviewMouseLeftButtonDown += callback; + return Disposable.Create(() => target.PreviewMouseLeftButtonDown -= callback); + } + + public static IDisposable SubscribePreviewMouseRightButtonDown(this UIElement target, MouseButtonEventHandler callback) { + target.PreviewMouseRightButtonDown += callback; + return Disposable.Create(() => target.PreviewMouseRightButtonDown -= callback); + } + public static IDisposable SubscribeIsKeyboardFocusWithinChanged(this UIElement target, DependencyPropertyChangedEventHandler callback) { target.IsKeyboardFocusWithinChanged += callback; return Disposable.Create(() => target.IsKeyboardFocusWithinChanged -= callback); diff --git a/src/client/spark/view/Utility/WPFTracer.cs b/src/client/spark/view/Utility/WPFTracer.cs index 34e6c7018..903e757eb 100644 --- a/src/client/spark/view/Utility/WPFTracer.cs +++ b/src/client/spark/view/Utility/WPFTracer.cs @@ -38,7 +38,13 @@ namespace mbts.ui { element.SubscribeGotKeyboardFocus(on_event), element.SubscribePreviewGotKeyboardFocus(on_event), element.SubscribeLostKeyboardFocus(on_event), - element.SubscribePreviewLostKeyboardFocus(on_event)); + element.SubscribePreviewLostKeyboardFocus(on_event), + element.SubscribeMouseDown(on_event), + element.SubscribePreviewMouseDown(on_event), + element.SubscribeMouseLeftButtonDown(on_event), + element.SubscribePreviewMouseLeftButtonDown(on_event), + element.SubscribeMouseRightButtonDown(on_event), + element.SubscribePreviewMouseRightButtonDown(on_mouse_right_button_down)); } public void trace_quiet(FrameworkElement element) { @@ -70,7 +76,8 @@ namespace mbts.ui { { "focus_scope", FocusManager.GetFocusScope(sender as DependencyObject) }, { "logical_focus", FocusManager.GetFocusedElement(sender as DependencyObject) }, { "kb_focus", Keyboard.FocusedElement }, - { "mouse_capture", Mouse.Captured } + { "mouse_capture", Mouse.Captured }, + { "handled", e.Handled } }; public static Dictionary get_event_params(object sender, KeyEventArgs e) { @@ -89,6 +96,29 @@ namespace mbts.ui { return rv; } + public static Dictionary get_event_params(object sender, InputEventArgs e) { + var rv = get_event_params(sender, (RoutedEventArgs)e); + rv["timestamp"] = e.Timestamp; + rv["device"] = e.Device; + return rv; + } + + public static Dictionary get_event_params(object sender, MouseEventArgs e) { + var rv = get_event_params(sender, (InputEventArgs)e); + rv["left_button"] = e.LeftButton; + rv["middle_button"] = e.MiddleButton; + rv["right_button"] = e.RightButton; + return rv; + } + + public static Dictionary get_event_params(object sender, MouseButtonEventArgs e) { + var rv = get_event_params(sender, (MouseEventArgs)e); + rv["changed_button"] = e.ChangedButton; + rv["button_state"] = e.ButtonState; + rv["click_count"] = e.ClickCount; + return rv; + } + public void on_event(object sender, RoutedEventArgs e) => Log.Ui.log_at(level, $"{name} {_fmt_params(get_event_params(sender, e))}"); @@ -98,7 +128,16 @@ namespace mbts.ui { public void on_event(object sender, KeyboardFocusChangedEventArgs e) => Log.Ui.log_at(level, $"{name} {_fmt_params(get_event_params(sender, e))}"); - static string _fmt_params(IEnumerable> parameters, string separator = ", ") => - separator.join(parameters.empty_if_null().Select(kv => $"{kv.Key}: {kv.Value}")); + public void on_event(object sender, MouseEventArgs e) => + Log.Ui.log_at(level, $"{name} {_fmt_params(get_event_params(sender, e))}"); + + public void on_event(object sender, MouseButtonEventArgs e) => + Log.Ui.log_at(level, $"{name} {_fmt_params(get_event_params(sender, e))}"); + + public void on_mouse_right_button_down(object sender, MouseButtonEventArgs e) => + Log.Ui.log_at(level, $"{name} {_fmt_params(get_event_params(sender, e))}"); + + string _fmt_params(IEnumerable> parameters) => + parameter_separator.join(parameters.empty_if_null().Select(kv => $"{kv.Key}: {kv.Value}")); } }