Browse Source

Fixed PlatformHotkeyConfiguration obsolete API usage.

pull/3391/head
José Pedro 6 years ago
parent
commit
11b1ec2ded
No known key found for this signature in database GPG Key ID: B8247B9301707B83
  1. 4
      src/Avalonia.Controls/TextBox.cs
  2. 14
      src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
  3. 2
      src/Avalonia.Native/AvaloniaNativePlatform.cs
  4. 2
      src/Avalonia.X11/X11Platform.cs

4
src/Avalonia.Controls/TextBox.cs

@ -403,12 +403,12 @@ namespace Avalonia.Controls
bool movement = false; bool movement = false;
bool selection = false; bool selection = false;
bool handled = false; bool handled = false;
var modifiers = e.Modifiers; var modifiers = e.KeyModifiers;
var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>(); var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
bool Match(List<KeyGesture> gestures) => gestures.Any(g => g.Matches(e)); bool Match(List<KeyGesture> gestures) => gestures.Any(g => g.Matches(e));
bool DetectSelection() => e.Modifiers.HasFlag(keymap.SelectionModifiers); bool DetectSelection() => e.KeyModifiers.HasFlag(keymap.SelectionModifiers);
if (Match(keymap.SelectAll)) if (Match(keymap.SelectAll))
{ {

14
src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs

@ -4,14 +4,14 @@ namespace Avalonia.Input.Platform
{ {
public class PlatformHotkeyConfiguration public class PlatformHotkeyConfiguration
{ {
public PlatformHotkeyConfiguration() : this(InputModifiers.Control) public PlatformHotkeyConfiguration() : this(KeyModifiers.Control)
{ {
} }
public PlatformHotkeyConfiguration(InputModifiers commandModifiers, public PlatformHotkeyConfiguration(KeyModifiers commandModifiers,
InputModifiers selectionModifiers = InputModifiers.Shift, KeyModifiers selectionModifiers = KeyModifiers.Shift,
InputModifiers wholeWordTextActionModifiers = InputModifiers.Control) KeyModifiers wholeWordTextActionModifiers = KeyModifiers.Control)
{ {
CommandModifiers = commandModifiers; CommandModifiers = commandModifiers;
SelectionModifiers = selectionModifiers; SelectionModifiers = selectionModifiers;
@ -75,9 +75,9 @@ namespace Avalonia.Input.Platform
}; };
} }
public InputModifiers CommandModifiers { get; set; } public KeyModifiers CommandModifiers { get; set; }
public InputModifiers WholeWordTextActionModifiers { get; set; } public KeyModifiers WholeWordTextActionModifiers { get; set; }
public InputModifiers SelectionModifiers { get; set; } public KeyModifiers SelectionModifiers { get; set; }
public List<KeyGesture> Copy { get; set; } public List<KeyGesture> Copy { get; set; }
public List<KeyGesture> Cut { get; set; } public List<KeyGesture> Cut { get; set; }
public List<KeyGesture> Paste { get; set; } public List<KeyGesture> Paste { get; set; }

2
src/Avalonia.Native/AvaloniaNativePlatform.cs

@ -101,7 +101,7 @@ namespace Avalonia.Native
.Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60)) .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
.Bind<ISystemDialogImpl>().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs())) .Bind<ISystemDialogImpl>().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs()))
.Bind<IWindowingPlatformGlFeature>().ToConstant(new GlPlatformFeature(_factory.ObtainGlFeature())) .Bind<IWindowingPlatformGlFeature>().ToConstant(new GlPlatformFeature(_factory.ObtainGlFeature()))
.Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(InputModifiers.Windows)) .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Meta))
.Bind<IMountedVolumeInfoProvider>().ToConstant(new MacOSMountedVolumeInfoProvider()); .Bind<IMountedVolumeInfoProvider>().ToConstant(new MacOSMountedVolumeInfoProvider());
} }

2
src/Avalonia.X11/X11Platform.cs

@ -44,7 +44,7 @@ namespace Avalonia.X11
.Bind<IPlatformThreadingInterface>().ToConstant(new X11PlatformThreading(this)) .Bind<IPlatformThreadingInterface>().ToConstant(new X11PlatformThreading(this))
.Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60)) .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
.Bind<IRenderLoop>().ToConstant(new RenderLoop()) .Bind<IRenderLoop>().ToConstant(new RenderLoop())
.Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(InputModifiers.Control)) .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Control))
.Bind<IKeyboardDevice>().ToFunc(() => KeyboardDevice) .Bind<IKeyboardDevice>().ToFunc(() => KeyboardDevice)
.Bind<IStandardCursorFactory>().ToConstant(new X11CursorFactory(Display)) .Bind<IStandardCursorFactory>().ToConstant(new X11CursorFactory(Display))
.Bind<IClipboard>().ToConstant(new X11Clipboard(this)) .Bind<IClipboard>().ToConstant(new X11Clipboard(this))

Loading…
Cancel
Save