Browse Source

Merge branch 'master' into enable-trimming

pull/9480/head
Max Katz 4 years ago
committed by GitHub
parent
commit
eb1f2edaed
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs
  2. 6
      src/Avalonia.Controls/Notifications/WindowNotificationManager.cs

6
src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs

@ -20,7 +20,8 @@ namespace Avalonia.Input.Platform
WholeWordTextActionModifiers = wholeWordTextActionModifiers;
Copy = new List<KeyGesture>
{
new KeyGesture(Key.C, commandModifiers)
new KeyGesture(Key.C, commandModifiers),
new KeyGesture(Key.Insert, KeyModifiers.Control)
};
Cut = new List<KeyGesture>
{
@ -28,7 +29,8 @@ namespace Avalonia.Input.Platform
};
Paste = new List<KeyGesture>
{
new KeyGesture(Key.V, commandModifiers)
new KeyGesture(Key.V, commandModifiers),
new KeyGesture(Key.Insert, KeyModifiers.Shift)
};
Undo = new List<KeyGesture>
{

6
src/Avalonia.Controls/Notifications/WindowNotificationManager.cs

@ -146,7 +146,11 @@ namespace Avalonia.Controls.Notifications
{
var adornerLayer = host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer;
adornerLayer?.Children.Add(this);
if (adornerLayer is not null)
{
adornerLayer.Children.Add(this);
AdornerLayer.SetAdornedElement(this, adornerLayer);
}
}
private void UpdatePseudoClasses(NotificationPosition position)

Loading…
Cancel
Save