mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-7449: Fix press-and-hold cancel keys not being swallowed by JBR

Browse Source 
(cherry picked from commit a0dbdff2b0)
This commit is contained in:
Nikita Tsarev
2024-07-29 17:29:36 +02:00
committed by jbrbot
parent 4a62198289
commit ac2fe7c617
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
View File

@@ -375,6 +375,9 @@ static void debugPrintNSEvent(NSEvent* event, const char* comment) {
#ifdef LOG_KEY_EVENTS
debugPrintNSEvent(event, "keyDown");
#endif
// Check for willBeHandledByComplexInputMethod here, because interpretKeyEvents might invalidate that field
bool isPressAndHold = fEnablePressAndHold && [event willBeHandledByComplexInputMethod] && fInputMethodLOCKABLE;
fProcessingKeystroke = YES;
fKeyEventsNeeded = ![(NSString *)kbdLayout containsString:@KEYMAN_LAYOUT];
@@ -392,8 +395,7 @@ static void debugPrintNSEvent(NSEvent* event, const char* comment) {
[self interpretKeyEvents:[NSArray arrayWithObject:event]];
}
if (fEnablePressAndHold && [event willBeHandledByComplexInputMethod] &&
fInputMethodLOCKABLE)
if (isPressAndHold)
{
BOOL skipProcessingCancelKeys = YES;
fProcessingKeystroke = NO;