diff options
| author | Patrick Luby <plubius@neooffice.org> | 2023-01-17 16:26:00 -0500 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-01-17 22:21:04 +0000 |
| commit | ef558d0aab44421ad5cd8362724ff1410af1b480 (patch) | |
| tree | 22dbe5a09f76531552b02996b9a74adc7bf9eccb /vcl | |
| parent | 98550980e414ca6d611e6c3779eed2e5e66f5641 (diff) | |
Related: tdf#42437 Skip special press-and-hold handling for action keys
Pressing and holding action keys such as arrow keys must not be handled
like pressing and holding a character key as it will insert unexpected
text.
Change-Id: I6beaff265e6cae30337b025791692ff67b760ff8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145689
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/salframeview.mm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 98765c761969..b36cd23721ea 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -1115,7 +1115,11 @@ static AquaSalFrame* getMouseContainerFrame() // Handle repeat key events by explicitly inserting the text if // -[NSResponder interpretKeyEvents:] does not insert or mark any // text. Note: do not do this step if there is uncommitted text. - if ( !mpLastMarkedText && mpLastEvent && [mpLastEvent type] == NSEventTypeKeyDown && [mpLastEvent isARepeat] ) + // Related: tdf#42437 Skip special press-and-hold handling for action keys + // Pressing and holding action keys such as arrow keys must not be + // handled like pressing and holding a character key as it will + // insert unexpected text. + if ( !mbKeyHandled && !mpLastMarkedText && mpLastEvent && [mpLastEvent type] == NSEventTypeKeyDown && [mpLastEvent isARepeat] ) { NSString *pChars = [mpLastEvent characters]; [self insertText:pChars replacementRange:NSMakeRange( 0, [pChars length] )]; @@ -1264,9 +1268,13 @@ static AquaSalFrame* getMouseContainerFrame() mpFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); } - mbKeyHandled = true; [self unmarkText]; } + + // Mark event as handled even if the frame isn't valid like is done in + // [self setMarkedText:selectedRange:replacementRange:] and + // [self doCommandBySelector:] + mbKeyHandled = true; } -(void)insertTab: (id)aSender |