aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Fokin <Denis.Fokin@jetbrains.com>2017-03-28 13:03:12 +0300
committerDenis Fokin <Denis.Fokin@jetbrains.com>2017-03-28 13:03:48 +0300
commit7ec5c30b3dcb7773534cf62ecd116dde06962d31 (patch)
tree22dbf5097c6ea72019adac14f5be48b0e9761dcc
parentfc667b85160bc9ae9f5637f519e9b7ff991b9cda (diff)
downloadjdk8u_jdk-7ec5c30b3dcb7773534cf62ecd116dde06962d31.tar.gz
JRE-270 "Comment with line comment" comments multiple lines
-rw-r--r--src/macosx/native/sun/awt/AWTView.m8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/macosx/native/sun/awt/AWTView.m b/src/macosx/native/sun/awt/AWTView.m
index 9b99719d4d..71bbbfbd0c 100644
--- a/src/macosx/native/sun/awt/AWTView.m
+++ b/src/macosx/native/sun/awt/AWTView.m
@@ -365,7 +365,13 @@ AWT_ASSERT_APPKIT_THREAD;
- (BOOL) performKeyEquivalent: (NSEvent *) event {
- if ([event keyCode] == 24 && [[event characters] isEqual:@"+"]) {
+ // French keyboard layouts invoke the method several times
+ // with '+' character, but '/' keycode. Correct character
+ // is passed into the method ony once.
+ // Current keyboard layout status call could be quite expensive.
+ // We assume that where are no keyboards that actually use
+ // the improper combination
+ if ([event keyCode] == 44 && [[event characters] isEqual:@"+"]) {
return 0;
}