diff --git a/src/Avalonia.Base/Input/GotFocusEventArgs.cs b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
index f3de55ebae..8d15c3f9ec 100644
--- a/src/Avalonia.Base/Input/GotFocusEventArgs.cs
+++ b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
@@ -7,19 +7,18 @@ namespace Avalonia.Input
///
public class GotFocusEventArgs : RoutedEventArgs
{
- internal GotFocusEventArgs()
+ public GotFocusEventArgs() : base(InputElement.GotFocusEvent)
{
-
}
///
/// Gets or sets a value indicating how the change in focus occurred.
///
- public NavigationMethod NavigationMethod { get; set; }
+ public NavigationMethod NavigationMethod { get; init; }
///
/// Gets or sets any key modifiers active at the time of focus.
///
- public KeyModifiers KeyModifiers { get; set; }
+ public KeyModifiers KeyModifiers { get; init; }
}
}
diff --git a/src/Avalonia.Base/Input/KeyEventArgs.cs b/src/Avalonia.Base/Input/KeyEventArgs.cs
index 35fa549995..0eaa7d43fb 100644
--- a/src/Avalonia.Base/Input/KeyEventArgs.cs
+++ b/src/Avalonia.Base/Input/KeyEventArgs.cs
@@ -10,10 +10,10 @@ namespace Avalonia.Input
}
- public IKeyboardDevice? Device { get; set; }
+ public IKeyboardDevice? Device { get; init; }
- public Key Key { get; set; }
+ public Key Key { get; init; }
- public KeyModifiers KeyModifiers { get; set; }
+ public KeyModifiers KeyModifiers { get; init; }
}
}
diff --git a/src/Avalonia.Base/Input/KeyboardDevice.cs b/src/Avalonia.Base/Input/KeyboardDevice.cs
index 26ff71a4e7..c46834fff4 100644
--- a/src/Avalonia.Base/Input/KeyboardDevice.cs
+++ b/src/Avalonia.Base/Input/KeyboardDevice.cs
@@ -156,7 +156,6 @@ namespace Avalonia.Input
interactive?.RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = method,
KeyModifiers = keyModifiers,
});
diff --git a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
index dd8a8f0385..c405cdfacd 100644
--- a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Input
{
public class PointerDeltaEventArgs : PointerEventArgs
{
- public Vector Delta { get; set; }
+ public Vector Delta { get; }
[Unstable]
[Obsolete("This constructor might be removed in 12.0.")]
diff --git a/src/Avalonia.Base/Input/PointerWheelEventArgs.cs b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
index 3a23effa79..903019d85d 100644
--- a/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Input
{
public class PointerWheelEventArgs : PointerEventArgs
{
- public Vector Delta { get; set; }
+ public Vector Delta { get; }
[Unstable]
[Obsolete("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow.MouseWheel.")]
diff --git a/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
index 48c882197f..cd1cf29bcf 100644
--- a/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
+++ b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
@@ -12,6 +12,6 @@ namespace Avalonia.Input.Raw
Text = text;
}
- public string Text { get; set; }
+ public string Text { get; }
}
}
diff --git a/src/Avalonia.Base/Input/VectorEventArgs.cs b/src/Avalonia.Base/Input/VectorEventArgs.cs
index 000fd52f69..2ce95cf35a 100644
--- a/src/Avalonia.Base/Input/VectorEventArgs.cs
+++ b/src/Avalonia.Base/Input/VectorEventArgs.cs
@@ -5,6 +5,6 @@ namespace Avalonia.Input
{
public class VectorEventArgs : RoutedEventArgs
{
- public Vector Vector { get; set; }
+ public Vector Vector { get; init; }
}
}
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
index b358c98a62..942eb8bf5b 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
@@ -28,7 +28,6 @@ namespace Avalonia.Controls.UnitTests
target.Presenter.Panel.Children[1].RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = NavigationMethod.Directional,
KeyModifiers = KeyModifiers.Shift
});
@@ -52,7 +51,6 @@ namespace Avalonia.Controls.UnitTests
target.Presenter.Panel.Children[1].RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = NavigationMethod.Directional,
KeyModifiers = KeyModifiers.Control
});
@@ -77,7 +75,6 @@ namespace Avalonia.Controls.UnitTests
target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = NavigationMethod.Directional,
KeyModifiers = KeyModifiers.Control
});
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index cb4e81001f..131642fc4e 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -33,7 +33,6 @@ namespace Avalonia.Controls.UnitTests
target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = NavigationMethod.Tab,
});
@@ -53,7 +52,6 @@ namespace Avalonia.Controls.UnitTests
target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = NavigationMethod.Directional,
});
@@ -73,7 +71,6 @@ namespace Avalonia.Controls.UnitTests
target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = NavigationMethod.Directional,
KeyModifiers = KeyModifiers.Control
});
@@ -96,7 +93,6 @@ namespace Avalonia.Controls.UnitTests
target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = NavigationMethod.Directional,
KeyModifiers = KeyModifiers.Control
});