encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "cocoa: Discard the IME Candidate Window immediately when Escape is pressed" 

This reverts commit 0d76e2a8a1, as it introduced other issues:
https://github.com/libsdl-org/SDL/pull/6486#issuecomment-1304684865
This commit is contained in:
Sam Lantinga 2022-11-06 10:52:20 -08:00
parent f2ce7c5fb2
commit c2675d74c5
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/cocoa/SDL_cocoakeyboard.m
View File

@ -180,13 +180,6 @@
return [NSArray array]; return [NSArray array];
} }
// Discard the IME Candidate Window
- (void)cancelOperation:(id)sender
{
[[self inputContext] discardMarkedText];
[self unmarkText];
}
@end @end
static void static void
@ -415,11 +408,6 @@ Cocoa_HandleKeyEvent(_THIS, NSEvent *event)
SDL_Log("The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL forums/mailing list <https://discourse.libsdl.org/> or to Christian Walther <cwalther@gmx.ch>. Mac virtual key code is %d.\n", scancode); SDL_Log("The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL forums/mailing list <https://discourse.libsdl.org/> or to Christian Walther <cwalther@gmx.ch>. Mac virtual key code is %d.\n", scancode);
} }
#endif #endif
/* Discard the IME Candidate Window immediately */
if (code == SDL_SCANCODE_ESCAPE) {
[data.fieldEdit cancelOperation:NULL];
}
if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) { if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
/* FIXME CW 2007-08-16: only send those events to the field editor for which we actually want text events, not e.g. esc or function keys. Arrow keys in particular seem to produce crashes sometimes. */ /* FIXME CW 2007-08-16: only send those events to the field editor for which we actually want text events, not e.g. esc or function keys. Arrow keys in particular seem to produce crashes sometimes. */
[data.fieldEdit interpretKeyEvents:[NSArray arrayWithObject:event]]; [data.fieldEdit interpretKeyEvents:[NSArray arrayWithObject:event]];