Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #35114 from timothyqiu/macos-ime

Browse source 
Fixes IME input backspace on macOS
This commit is contained in:
Rémi Verschelde 2020-01-14 13:06:03 +01:00 • committed by GitHub
commit 4d3acbcb3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
platform/osx/os_osx.mm
View file

@ -479,7 +479,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
}
- (NSRange)markedRange {
return (markedText.length > 0) ? NSMakeRange(0, markedText.length - 1) : kEmptyRange;
return NSMakeRange(0, markedText.length);
}
- (NSRange)selectedRange {
@ -492,6 +492,10 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
} else {
[markedText initWithString:aString];
}
if (markedText.length == 0) {
[self unmarkText];
return;
}
if (OS_OSX::singleton->im_active) {
imeInputEventInProgress = true;
OS_OSX::singleton->im_text.parse_utf8([[markedText mutableString] UTF8String]);