Input - Prefixed event args

src/Artemis.Core/Services/Input/Events/ArtemisKeyboardKeyEventArgs.cs

@@ -5,9 +5,9 @@ namespace Artemis.Core.Services
     /// <summary>
     ///     Contains data for keyboard input events
     /// </summary>
-    public class KeyboardKeyEventArgs : EventArgs
+    public class ArtemisKeyboardKeyEventArgs : EventArgs
     {
-        internal KeyboardKeyEventArgs(ArtemisDevice? device, ArtemisLed? led, KeyboardKey key, KeyboardModifierKey modifiers)
+        internal ArtemisKeyboardKeyEventArgs(ArtemisDevice? device, ArtemisLed? led, KeyboardKey key, KeyboardModifierKey modifiers)
         {
             Device = device;
             Led = led;

src/Artemis.Core/Services/Input/Events/ArtemisKeyboardKeyUpDownEventArgs.cs

@@ -3,9 +3,9 @@
     /// <summary>
     ///     Contains data for keyboard input events
     /// </summary>
-    public class KeyboardKeyUpDownEventArgs : KeyboardKeyEventArgs
+    public class ArtemisKeyboardKeyUpDownEventArgs : ArtemisKeyboardKeyEventArgs
     {
-        internal KeyboardKeyUpDownEventArgs(ArtemisDevice? device, ArtemisLed? led, KeyboardKey key, KeyboardModifierKey modifiers, bool isDown) : base(device, led, key, modifiers)
+        internal ArtemisKeyboardKeyUpDownEventArgs(ArtemisDevice? device, ArtemisLed? led, KeyboardKey key, KeyboardModifierKey modifiers, bool isDown) : base(device, led, key, modifiers)
         {
             IsDown = isDown;
         }

src/Artemis.Core/Services/Input/Events/ArtemisMouseButtonEventArgs.cs

@@ -5,9 +5,9 @@ namespace Artemis.Core.Services
     /// <summary>
     ///     Contains data for mouse input events
     /// </summary>
-    public class MouseButtonEventArgs : EventArgs
+    public class ArtemisMouseButtonEventArgs : EventArgs
     {
-        internal MouseButtonEventArgs(ArtemisDevice? device, ArtemisLed? led, MouseButton button)
+        internal ArtemisMouseButtonEventArgs(ArtemisDevice? device, ArtemisLed? led, MouseButton button)
         {
             Device = device;
             Led = led;

src/Artemis.Core/Services/Input/Events/ArtemisMouseButtonUpDownEventArgs.cs

@@ -3,9 +3,9 @@
     /// <summary>
     ///     Contains data for mouse input events
     /// </summary>
-    public class MouseButtonUpDownEventArgs : MouseButtonEventArgs
+    public class ArtemisMouseButtonUpDownEventArgs : ArtemisMouseButtonEventArgs
     {
-        internal MouseButtonUpDownEventArgs(ArtemisDevice? device, ArtemisLed? led, MouseButton button, bool isDown) : base(device, led, button)
+        internal ArtemisMouseButtonUpDownEventArgs(ArtemisDevice? device, ArtemisLed? led, MouseButton button, bool isDown) : base(device, led, button)
         {
             IsDown = isDown;
         }

src/Artemis.Core/Services/Input/Events/ArtemisMouseMoveEventArgs.cs

@@ -5,7 +5,7 @@ namespace Artemis.Core.Services
     /// <summary>
     ///     Contains data for mouse movement events
     /// </summary>
-    public class MouseMoveEventArgs : EventArgs
+    public class ArtemisMouseMoveEventArgs : EventArgs
     {
         /// <summary>
         /// </summary>
@@ -14,7 +14,7 @@ namespace Artemis.Core.Services
         /// <param name="cursorY">The Y position of the mouse cursor (not necessarily tied to the specific device)</param>
         /// <param name="deltaX">The movement delta in the horizontal direction</param>
         /// <param name="deltaY">The movement delta in the vertical direction</param>
-        internal MouseMoveEventArgs(ArtemisDevice? device, int cursorX, int cursorY, int deltaX, int deltaY)
+        internal ArtemisMouseMoveEventArgs(ArtemisDevice? device, int cursorX, int cursorY, int deltaX, int deltaY)
         {
             Device = device;
             CursorX = cursorX;

src/Artemis.Core/Services/Input/Events/ArtemisMouseScrollEventArgs.cs

@@ -5,14 +5,14 @@ namespace Artemis.Core.Services
     /// <summary>
     ///     Contains data for mouse scroll events
     /// </summary>
-    public class MouseScrollEventArgs : EventArgs
+    public class ArtemisMouseScrollEventArgs : EventArgs
     {
         /// <summary>
         /// </summary>
         /// <param name="device">The device that triggered the event</param>
         /// <param name="direction">The direction in which was scrolled</param>
         /// <param name="delta">The scroll delta (can positive or negative)</param>
-        internal MouseScrollEventArgs(ArtemisDevice? device, MouseScrollDirection direction, int delta)
+        internal ArtemisMouseScrollEventArgs(ArtemisDevice? device, MouseScrollDirection direction, int delta)
         {
             Device = device;
             Direction = direction;

src/Artemis.Core/Services/Input/InputService.cs

@@ -198,7 +198,7 @@ namespace Artemis.Core.Services
                 led = e.Device.Leds.FirstOrDefault(l => l.RgbLed.Id == ledId);
 
             // Create the UpDown event args because it can be used for every event
-            KeyboardKeyUpDownEventArgs eventArgs = new KeyboardKeyUpDownEventArgs(e.Device, led, e.Key, keyboardModifierKey, e.IsDown);
+            ArtemisKeyboardKeyUpDownEventArgs eventArgs = new ArtemisKeyboardKeyUpDownEventArgs(e.Device, led, e.Key, keyboardModifierKey, e.IsDown);
             OnKeyboardKeyUpDown(eventArgs);
             if (e.IsDown)
                 OnKeyboardKeyDown(eventArgs);
@@ -263,7 +263,7 @@ namespace Artemis.Core.Services
                 led = e.Device.Leds.FirstOrDefault(l => l.RgbLed.Id == ledId);
 
             // Create the UpDown event args because it can be used for every event
-            MouseButtonUpDownEventArgs eventArgs = new MouseButtonUpDownEventArgs(e.Device, led, e.Button, e.IsDown);
+            ArtemisMouseButtonUpDownEventArgs eventArgs = new ArtemisMouseButtonUpDownEventArgs(e.Device, led, e.Button, e.IsDown);
             OnMouseButtonUpDown(eventArgs);
             if (e.IsDown)
                 OnMouseButtonDown(eventArgs);
@@ -275,13 +275,13 @@ namespace Artemis.Core.Services
 
         private void InputProviderOnMouseScrollDataReceived(object? sender, InputProviderMouseScrollEventArgs e)
         {
-            OnMouseScroll(new MouseScrollEventArgs(e.Device, e.Direction, e.Delta));
+            OnMouseScroll(new ArtemisMouseScrollEventArgs(e.Device, e.Direction, e.Delta));
             // _logger.Verbose("Mouse scroll data: Direction: {direction}, delta: {delta}, device: {device} ", e.Direction, e.Delta, e.Device);
         }
 
         private void InputProviderOnMouseMoveDataReceived(object? sender, InputProviderMouseMoveEventArgs e)
         {
-            OnMouseMove(new MouseMoveEventArgs(e.Device, e.CursorX, e.CursorY, e.DeltaX, e.DeltaY));
+            OnMouseMove(new ArtemisMouseMoveEventArgs(e.Device, e.CursorX, e.CursorY, e.DeltaX, e.DeltaY));
             // _logger.Verbose("Mouse move data: XY: {X},{Y} - delta XY: {deltaX},{deltaY} - device: {device} ", e.CursorX, e.CursorY, e.DeltaX, e.DeltaY, e.Device);
         }
 
@@ -289,52 +289,52 @@ namespace Artemis.Core.Services
 
         #region Events
 
-        public event EventHandler<KeyboardKeyUpDownEventArgs>? KeyboardKeyUpDown;
+        public event EventHandler<ArtemisKeyboardKeyUpDownEventArgs>? KeyboardKeyUpDown;
-        public event EventHandler<KeyboardKeyEventArgs>? KeyboardKeyDown;
+        public event EventHandler<ArtemisKeyboardKeyEventArgs>? KeyboardKeyDown;
-        public event EventHandler<KeyboardKeyEventArgs>? KeyboardKeyUp;
+        public event EventHandler<ArtemisKeyboardKeyEventArgs>? KeyboardKeyUp;
-        public event EventHandler<MouseButtonUpDownEventArgs>? MouseButtonUpDown;
+        public event EventHandler<ArtemisMouseButtonUpDownEventArgs>? MouseButtonUpDown;
-        public event EventHandler<MouseButtonEventArgs>? MouseButtonDown;
+        public event EventHandler<ArtemisMouseButtonEventArgs>? MouseButtonDown;
-        public event EventHandler<MouseButtonEventArgs>? MouseButtonUp;
+        public event EventHandler<ArtemisMouseButtonEventArgs>? MouseButtonUp;
-        public event EventHandler<MouseScrollEventArgs>? MouseScroll;
+        public event EventHandler<ArtemisMouseScrollEventArgs>? MouseScroll;
-        public event EventHandler<MouseMoveEventArgs>? MouseMove;
+        public event EventHandler<ArtemisMouseMoveEventArgs>? MouseMove;
         public event EventHandler? DeviceIdentified;
 
-        protected virtual void OnKeyboardKeyUpDown(KeyboardKeyUpDownEventArgs e)
+        protected virtual void OnKeyboardKeyUpDown(ArtemisKeyboardKeyUpDownEventArgs e)
         {
             KeyboardKeyUpDown?.Invoke(this, e);
         }
 
-        protected virtual void OnKeyboardKeyDown(KeyboardKeyEventArgs e)
+        protected virtual void OnKeyboardKeyDown(ArtemisKeyboardKeyEventArgs e)
         {
             KeyboardKeyDown?.Invoke(this, e);
         }
 
-        protected virtual void OnKeyboardKeyUp(KeyboardKeyEventArgs e)
+        protected virtual void OnKeyboardKeyUp(ArtemisKeyboardKeyEventArgs e)
         {
             KeyboardKeyUp?.Invoke(this, e);
         }
 
-        protected virtual void OnMouseButtonUpDown(MouseButtonUpDownEventArgs e)
+        protected virtual void OnMouseButtonUpDown(ArtemisMouseButtonUpDownEventArgs e)
         {
             MouseButtonUpDown?.Invoke(this, e);
         }
 
-        protected virtual void OnMouseButtonDown(MouseButtonEventArgs e)
+        protected virtual void OnMouseButtonDown(ArtemisMouseButtonEventArgs e)
         {
             MouseButtonDown?.Invoke(this, e);
         }
 
-        protected virtual void OnMouseButtonUp(MouseButtonEventArgs e)
+        protected virtual void OnMouseButtonUp(ArtemisMouseButtonEventArgs e)
         {
             MouseButtonUp?.Invoke(this, e);
         }
 
-        protected virtual void OnMouseScroll(MouseScrollEventArgs e)
+        protected virtual void OnMouseScroll(ArtemisMouseScrollEventArgs e)
         {
             MouseScroll?.Invoke(this, e);
         }
 
-        protected virtual void OnMouseMove(MouseMoveEventArgs e)
+        protected virtual void OnMouseMove(ArtemisMouseMoveEventArgs e)
         {
             MouseMove?.Invoke(this, e);
         }

src/Artemis.Core/Services/Input/Interfaces/IInputService.cs

@@ -35,42 +35,42 @@ namespace Artemis.Core.Services
         /// <summary>
         ///     Occurs whenever a key on a keyboard was pressed or released
         /// </summary>
-        event EventHandler<KeyboardKeyUpDownEventArgs> KeyboardKeyUpDown;
+        event EventHandler<ArtemisKeyboardKeyUpDownEventArgs> KeyboardKeyUpDown;
 
         /// <summary>
         ///     Occurs whenever a key on a keyboard was pressed
         /// </summary>
-        event EventHandler<KeyboardKeyEventArgs> KeyboardKeyDown;
+        event EventHandler<ArtemisKeyboardKeyEventArgs> KeyboardKeyDown;
 
         /// <summary>
         ///     Occurs whenever a key on a keyboard was released
         /// </summary>
-        event EventHandler<KeyboardKeyEventArgs> KeyboardKeyUp;
+        event EventHandler<ArtemisKeyboardKeyEventArgs> KeyboardKeyUp;
 
         /// <summary>
         ///     Occurs whenever a button on a mouse was pressed or released
         /// </summary>
-        event EventHandler<MouseButtonUpDownEventArgs> MouseButtonUpDown;
+        event EventHandler<ArtemisMouseButtonUpDownEventArgs> MouseButtonUpDown;
 
         /// <summary>
         ///     Occurs whenever a button on a mouse was pressed
         /// </summary>
-        event EventHandler<MouseButtonEventArgs> MouseButtonDown;
+        event EventHandler<ArtemisMouseButtonEventArgs> MouseButtonDown;
 
         /// <summary>
         ///     Occurs whenever a button on a mouse was released
         /// </summary>
-        event EventHandler<MouseButtonEventArgs> MouseButtonUp;
+        event EventHandler<ArtemisMouseButtonEventArgs> MouseButtonUp;
 
         /// <summary>
         ///     Occurs whenever a the scroll wheel of a mouse is turned
         /// </summary>
-        event EventHandler<MouseScrollEventArgs> MouseScroll;
+        event EventHandler<ArtemisMouseScrollEventArgs> MouseScroll;
 
         /// <summary>
         ///     Occurs whenever a a mouse is moved
         /// </summary>
-        event EventHandler<MouseMoveEventArgs> MouseMove;
+        event EventHandler<ArtemisMouseMoveEventArgs> MouseMove;
 
         /// <summary>
         ///     Occurs when a device has been identified after calling <see cref="IdentifyDevice" />

src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs

@@ -12,7 +12,6 @@ using Artemis.UI.Screens.ProfileEditor.Visualization.Tools;
 using Artemis.UI.Screens.Shared;
 using Artemis.UI.Shared.Services;
 using Stylet;
-using MouseButtonEventArgs = System.Windows.Input.MouseButtonEventArgs;
 
 namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {

src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs

@@ -8,7 +8,6 @@ using Artemis.Core.LayerBrushes;
 using Artemis.Core.Services;
 using Artemis.UI.Properties;
 using Artemis.UI.Shared.Services;
-using MouseButtonEventArgs = System.Windows.Input.MouseButtonEventArgs;
 
 namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {

src/Artemis.UI/Screens/RootViewModel.cs

@@ -17,7 +17,6 @@ using Artemis.UI.Utilities;
 using MaterialDesignExtensions.Controls;
 using MaterialDesignThemes.Wpf;
 using Stylet;
-using MouseButtonEventArgs = System.Windows.Input.MouseButtonEventArgs;
 
 namespace Artemis.UI.Screens
 {

src/Artemis.UI/Screens/Splash/SplashViewModel.cs

@@ -6,7 +6,6 @@ using Humanizer;
 using MaterialDesignExtensions.Controls;
 using Stylet;
 using MouseButton = System.Windows.Input.MouseButton;
-using MouseButtonEventArgs = System.Windows.Input.MouseButtonEventArgs;
 
 namespace Artemis.UI.Screens.Splash
 {

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs

@@ -16,7 +16,6 @@ using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Stylet;
 using MouseButton = System.Windows.Input.MouseButton;
-using MouseButtonEventArgs = System.Windows.Input.MouseButtonEventArgs;
 
 namespace Artemis.UI.Screens.SurfaceEditor
 {