From 87556183a67b519ecf04db4ba566b8603be2a7c6 Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Thu, 30 Sep 2021 22:28:25 +0330 Subject: [PATCH 1/3] Add ImageOpened Event https://github.com/HandyOrg/HandyControl/issues/1000 --- .../Controls/Input/ImageSelector.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs index f49d841f..08575560 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs @@ -12,6 +12,16 @@ namespace HandyControl.Controls { public class ImageSelector : Control { + public static readonly RoutedEvent ImageOpenedEvent = + EventManager.RegisterRoutedEvent("ImageOpened", RoutingStrategy.Bubble, + typeof(EventHandler>), typeof(ImageSelector)); + + public event EventHandler> ImageOpened + { + add => AddHandler(ImageOpenedEvent, value); + remove => RemoveHandler(ImageOpenedEvent, value); + } + public ImageSelector() => CommandBindings.Add(new CommandBinding(ControlCommands.Switch, SwitchImage)); private void SwitchImage(object sender, ExecutedRoutedEventArgs e) @@ -34,6 +44,10 @@ namespace HandyControl.Controls }); SetValue(HasValuePropertyKey, ValueBoxes.TrueBox); SetCurrentValue(ToolTipProperty, dialog.FileName); + RaiseEvent(new FunctionEventArgs(ImageOpenedEvent, this) + { + Info = true + }); } } else From a214a01f7c6e11443a1eb18480919e72d0cff3f5 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Mon, 15 Nov 2021 22:39:50 +0800 Subject: [PATCH 2/3] chore: rename ImageOpenedEvent to ImageSelectedEvent (#1000) --- .../Controls/Input/ImageSelector.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs index 08575560..be31a430 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs @@ -12,14 +12,14 @@ namespace HandyControl.Controls { public class ImageSelector : Control { - public static readonly RoutedEvent ImageOpenedEvent = - EventManager.RegisterRoutedEvent("ImageOpened", RoutingStrategy.Bubble, - typeof(EventHandler>), typeof(ImageSelector)); + public static readonly RoutedEvent ImageSelectedEvent = + EventManager.RegisterRoutedEvent("ImageSelected", RoutingStrategy.Bubble, + typeof(RoutedEventHandler), typeof(ImageSelector)); - public event EventHandler> ImageOpened + public event RoutedEventHandler ImageSelected { - add => AddHandler(ImageOpenedEvent, value); - remove => RemoveHandler(ImageOpenedEvent, value); + add => AddHandler(ImageSelectedEvent, value); + remove => RemoveHandler(ImageSelectedEvent, value); } public ImageSelector() => CommandBindings.Add(new CommandBinding(ControlCommands.Switch, SwitchImage)); @@ -44,10 +44,7 @@ namespace HandyControl.Controls }); SetValue(HasValuePropertyKey, ValueBoxes.TrueBox); SetCurrentValue(ToolTipProperty, dialog.FileName); - RaiseEvent(new FunctionEventArgs(ImageOpenedEvent, this) - { - Info = true - }); + RaiseEvent(new RoutedEventArgs(ImageSelectedEvent, this)); } } else From 7b0f93d8e568bde2b36cca646c95cd90d23d2e0a Mon Sep 17 00:00:00 2001 From: "github-actions-dotnet-formatter[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 14:51:48 +0000 Subject: [PATCH 3/3] Automated dotnet-format update --- src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs index be31a430..f42e4065 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs @@ -21,7 +21,7 @@ namespace HandyControl.Controls add => AddHandler(ImageSelectedEvent, value); remove => RemoveHandler(ImageSelectedEvent, value); } - + public ImageSelector() => CommandBindings.Add(new CommandBinding(ControlCommands.Switch, SwitchImage)); private void SwitchImage(object sender, ExecutedRoutedEventArgs e)