Browse Source

Remove IKeyboardDevice/IPointerDevice/IDragDropDevice from public API, as they are not really used anywhere

pull/11574/head
Max Katz 3 years ago
parent
commit
eb05dac696
  1. 2
      src/Avalonia.Base/Input/IKeyboardDevice.cs
  2. 2
      src/Avalonia.Base/Input/IMouseDevice.cs
  3. 5
      src/Avalonia.Base/Input/IPenDevice.cs
  4. 2
      src/Avalonia.Base/Input/IPointerDevice.cs
  5. 2
      src/Avalonia.Base/Input/KeyEventArgs.cs
  6. 2
      src/Avalonia.Base/Input/KeyboardDevice.cs
  7. 2
      src/Avalonia.Base/Input/Raw/IDragDropDevice.cs
  8. 4
      src/Avalonia.Base/Input/TextInputEventArgs.cs
  9. 2
      tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

2
src/Avalonia.Base/Input/IKeyboardDevice.cs

@ -43,7 +43,7 @@ namespace Avalonia.Input
PenBarrelButton = 2048 PenBarrelButton = 2048
} }
[NotClientImplementable] [PrivateApi]
public interface IKeyboardDevice : IInputDevice public interface IKeyboardDevice : IInputDevice
{ {
} }

2
src/Avalonia.Base/Input/IMouseDevice.cs

@ -5,7 +5,7 @@ namespace Avalonia.Input
/// <summary> /// <summary>
/// Represents a mouse device. /// Represents a mouse device.
/// </summary> /// </summary>
[NotClientImplementable] [PrivateApi]
public interface IMouseDevice : IPointerDevice public interface IMouseDevice : IPointerDevice
{ {
} }

5
src/Avalonia.Base/Input/IPenDevice.cs

@ -1,8 +1,11 @@
namespace Avalonia.Input using Avalonia.Metadata;
namespace Avalonia.Input
{ {
/// <summary> /// <summary>
/// Represents a pen/stylus device. /// Represents a pen/stylus device.
/// </summary> /// </summary>
[PrivateApi]
public interface IPenDevice : IPointerDevice public interface IPenDevice : IPointerDevice
{ {

2
src/Avalonia.Base/Input/IPointerDevice.cs

@ -3,7 +3,7 @@ using Avalonia.Metadata;
namespace Avalonia.Input namespace Avalonia.Input
{ {
[NotClientImplementable] [PrivateApi]
public interface IPointerDevice : IInputDevice public interface IPointerDevice : IInputDevice
{ {
/// <summary> /// <summary>

2
src/Avalonia.Base/Input/KeyEventArgs.cs

@ -5,8 +5,6 @@ namespace Avalonia.Input
{ {
public class KeyEventArgs : RoutedEventArgs public class KeyEventArgs : RoutedEventArgs
{ {
public IKeyboardDevice? Device { get; init; }
public Key Key { get; init; } public Key Key { get; init; }
public KeyModifiers KeyModifiers { get; init; } public KeyModifiers KeyModifiers { get; init; }

2
src/Avalonia.Base/Input/KeyboardDevice.cs

@ -192,7 +192,6 @@ namespace Avalonia.Input
KeyEventArgs ev = new KeyEventArgs KeyEventArgs ev = new KeyEventArgs
{ {
RoutedEvent = routedEvent, RoutedEvent = routedEvent,
Device = this,
Key = keyInput.Key, Key = keyInput.Key,
KeyModifiers = keyInput.Modifiers.ToKeyModifiers(), KeyModifiers = keyInput.Modifiers.ToKeyModifiers(),
Source = element, Source = element,
@ -241,7 +240,6 @@ namespace Avalonia.Input
{ {
var ev = new TextInputEventArgs() var ev = new TextInputEventArgs()
{ {
Device = this,
Text = text.Text, Text = text.Text,
Source = element, Source = element,
RoutedEvent = InputElement.TextInputEvent RoutedEvent = InputElement.TextInputEvent

2
src/Avalonia.Base/Input/Raw/IDragDropDevice.cs

@ -2,7 +2,7 @@
namespace Avalonia.Input.Raw namespace Avalonia.Input.Raw
{ {
[NotClientImplementable] [PrivateApi]
public interface IDragDropDevice : IInputDevice public interface IDragDropDevice : IInputDevice
{ {
} }

4
src/Avalonia.Base/Input/TextInputEventArgs.cs

@ -4,8 +4,6 @@ namespace Avalonia.Input
{ {
public class TextInputEventArgs : RoutedEventArgs public class TextInputEventArgs : RoutedEventArgs
{ {
public IKeyboardDevice? Device { get; set; } public string? Text { get; init; }
public string? Text { get; set; }
} }
} }

2
tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

@ -2141,7 +2141,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.RaiseEvent(new TextInputEventArgs target.RaiseEvent(new TextInputEventArgs
{ {
RoutedEvent = InputElement.TextInputEvent, RoutedEvent = InputElement.TextInputEvent,
Device = KeyboardDevice.Instance,
Text = "Foo" Text = "Foo"
}); });
@ -2152,7 +2151,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
target.RaiseEvent(new TextInputEventArgs target.RaiseEvent(new TextInputEventArgs
{ {
RoutedEvent = InputElement.TextInputEvent, RoutedEvent = InputElement.TextInputEvent,
Device = KeyboardDevice.Instance,
Text = "Foo" Text = "Foo"
}); });

Loading…
Cancel
Save