From 4e3d89760d470767e90b36827280060db6376796 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 2 Oct 2018 20:34:39 +0100 Subject: [PATCH] dont beep on backspace or arrow keys. --- src/Avalonia.Native.OSX/window.mm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Avalonia.Native.OSX/window.mm b/src/Avalonia.Native.OSX/window.mm index 64deaa79327..0e745fdf8a7 100644 --- a/src/Avalonia.Native.OSX/window.mm +++ b/src/Avalonia.Native.OSX/window.mm @@ -504,11 +504,6 @@ - (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type auto modifiers = [self getModifiers:[event modifierFlags]]; _lastKeyHandled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key); - - if (modifiers != 0) - { - _lastKeyHandled = true; - } } - (BOOL)performKeyEquivalent:(NSEvent *)event @@ -554,7 +549,7 @@ - (AvnInputModifiers)getModifiers:(NSEventModifierFlags)mod - (BOOL)hasMarkedText { - return false; + return _lastKeyHandled; } - (NSRange)markedRange @@ -589,7 +584,10 @@ - (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)range actua - (void)insertText:(id)string replacementRange:(NSRange)replacementRange { - _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]); + if(!_lastKeyHandled) + { + _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]); + } } - (NSUInteger)characterIndexForPoint:(NSPoint)point