Fixes stuck modifier keys on focus lost on macOS (#16788)

Co-authored-by: Steven Kirk <[email protected]>
AvaloniaUI · Sep 12, 2024 · a31ff27 · a31ff27
1 parent add5ef0
commit a31ff27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/native/Avalonia.Native/src/OSX/AvnView.h b/native/Avalonia.Native/src/OSX/AvnView.h
@@ -18,6 +18,7 @@
 -(NSEvent* _Nonnull) lastMouseDownEvent;
 -(AvnPoint) translateLocalPoint:(AvnPoint)pt;
 -(void) onClosed;
+-(void) setModifiers:(NSEventModifierFlags)modifierFlags;
 
 -(AvnPlatformResizeReason) getResizeReason;
 -(void) setResizeReason:(AvnPlatformResizeReason)reason;

diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -480,6 +480,11 @@ - (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
     _parent->TopLevelEvents->RawKeyEvent(type, timestamp, modifiers, key, physicalKey, keySymbolUtf8);
 }
 
+- (void)setModifiers:(NSEventModifierFlags)modifierFlags
+{
+    _modifierState = [self getModifiers:modifierFlags];
+}
+
 - (void)flagsChanged:(NSEvent *)event
 {
     auto newModifierState = [self getModifiers:[event modifierFlags]];

diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -298,7 +298,10 @@ - (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
 {
     if (_parent == nullptr)
         return;
-
+
+    if (_parent->View != nullptr)
+        [_parent->View setModifiers:NSEvent.modifierFlags];
+
     _parent->BringToFront();
 
     dispatch_async(dispatch_get_main_queue(), ^{