Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix annoying sound alert when escape is pressed on OS X

Browse Source
This commit is contained in:
Marco Antognini 2011-07-03 22:29:34 +02:00
parent edf82be16b
commit efd97597bf
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/SFML/Window/OSX/SFOpenGLView.mm
View File

@ -448,17 +448,24 @@ sf::Key::Code NonLocalizedKeys(unsigned short keycode);
} }
} }
if (myUseKeyRepeat || ![theEvent isARepeat]) { if ((myUseKeyRepeat || ![theEvent isARepeat]) && [[theEvent characters] length] > 0) {
// Let's see if its a valid text.
NSText* text = [[self window] fieldEditor:YES forObject:self];
[text interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
NSString* string = [text string]; // Ignore escape key and non text keycode. (See NSEvent.h)
if ([string length] > 0) { // They produce a sound alert.
// It's a valid TextEntered event. unichar code = [[theEvent characters] characterAtIndex:0];
myRequester->TextEntered([string characterAtIndex:0]); if ([theEvent keyCode] != 0x35 && (code < 0xF700 || code > 0xF8FF)) {
[text setString:@""]; // Let's see if its a valid text.
NSText* text = [[self window] fieldEditor:YES forObject:self];
[text interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
NSString* string = [text string];
if ([string length] > 0) {
// It's a valid TextEntered event.
myRequester->TextEntered([string characterAtIndex:0]);
[text setString:@""];
}
} }
} }
} }