diff --git a/src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs b/src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs index 521f847a0a..1fc46dd396 100644 --- a/src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs +++ b/src/Avalonia.Base/Input/Platform/PlatformHotkeyConfiguration.cs @@ -20,7 +20,8 @@ namespace Avalonia.Input.Platform WholeWordTextActionModifiers = wholeWordTextActionModifiers; Copy = new List { - new KeyGesture(Key.C, commandModifiers) + new KeyGesture(Key.C, commandModifiers), + new KeyGesture(Key.Insert, KeyModifiers.Control) }; Cut = new List { @@ -28,7 +29,8 @@ namespace Avalonia.Input.Platform }; Paste = new List { - new KeyGesture(Key.V, commandModifiers) + new KeyGesture(Key.V, commandModifiers), + new KeyGesture(Key.Insert, KeyModifiers.Shift) }; Undo = new List { diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs index 45beaa0b2f..46c772f3b1 100644 --- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs +++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs @@ -146,7 +146,11 @@ namespace Avalonia.Controls.Notifications { var adornerLayer = host.FindDescendantOfType()?.AdornerLayer; - adornerLayer?.Children.Add(this); + if (adornerLayer is not null) + { + adornerLayer.Children.Add(this); + AdornerLayer.SetAdornedElement(this, adornerLayer); + } } private void UpdatePseudoClasses(NotificationPosition position)