JBR-4207, IDEA-287559: IDEA incorrectly handles AltGr key modifier.

This commit reverts the fix of JDK-8041928 and disables its regression tests.

(cherry picked from commit ba5209ec06)
(cherry picked from commit 19b7745ce3)
This commit is contained in:
Nikita Provotorov
2022-02-01 01:56:10 +07:00
committed by jbrbot
parent 3c94205b89
commit 7e52ab4029
2 changed files with 10 additions and 4 deletions

View File

@@ -2758,9 +2758,12 @@ AwtComponent::GetJavaModifiers()
if (HIBYTE(::GetKeyState(VK_MENU)) != 0) {
modifiers |= java_awt_event_InputEvent_ALT_DOWN_MASK;
}
if (HIBYTE(::GetKeyState(VK_RMENU)) != 0) {
modifiers |= java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK;
}
// Reverted fix of JDK-8041928: MouseEvent.getModifiersEx gives wrong result
// Because it breaks AltGr shortcuts.
// See IDEA-287559, JBR-4207 for more info.
// if (HIBYTE(::GetKeyState(VK_RMENU)) != 0) {
// modifiers |= java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK;
// }
if (HIBYTE(::GetKeyState(VK_MBUTTON)) != 0) {
modifiers |= java_awt_event_InputEvent_BUTTON2_DOWN_MASK;
}

View File

@@ -873,4 +873,7 @@ java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java
java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java JBR-1011 macosx-all
com/sun/java/swing/plaf/windows/Test8173145.java JBR-4197 windows-all
com/sun/java/swing/plaf/windows/AltFocusIssueTest.java JBR-4197 windows-all
com/sun/java/swing/plaf/windows/AltFocusIssueTest.java JBR-4197 windows-all
java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java JBR-4207 windows-all
jb/java/awt/keyboard/AltGrMustGenerateAltGrModifierTest4207.java JBR-4207 windows-all