Skip to content

Commit e82918e

Browse files
fhackenbergerakurtakov
authored andcommitted
Ignore ALT_GR when considering to hide content assists
On Linux ALT_GR is the level3 switch (at least on the US-INTL layout), when using 'include "level3(YOURKEY)"' in the xkb file.
1 parent 8ce2da8 commit e82918e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,8 @@ public boolean verifyKey(VerifyEvent e) {
13611361
break;
13621362

13631363
default :
1364-
if (e.keyCode != SWT.CAPS_LOCK && e.keyCode != SWT.MOD1 && e.keyCode != SWT.MOD2 && e.keyCode != SWT.MOD3 && e.keyCode != SWT.MOD4)
1364+
// On Linux ALT_GR is the level3 switch (at least on the US-INTL layout), when using 'include "level3(YOURKEY)"' in the xkb file
1365+
if (e.keyCode != SWT.CAPS_LOCK && e.keyCode != SWT.MOD1 && e.keyCode != SWT.MOD2 && e.keyCode != SWT.MOD3 && e.keyCode != SWT.MOD4 && e.keyCode != SWT.ALT_GR)
13651366
hide();
13661367
return true;
13671368
}

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,8 @@ private boolean contextSelectorKeyPressed(VerifyEvent e) {
770770
break;
771771

772772
default :
773-
if (e.keyCode != SWT.CAPS_LOCK && e.keyCode != SWT.MOD1 && e.keyCode != SWT.MOD2 && e.keyCode != SWT.MOD3 && e.keyCode != SWT.MOD4)
773+
// On Linux ALT_GR is the level3 switch (at least on the US-INTL layout), when using 'include "level3(YOURKEY)"' in the xkb file
774+
if (e.keyCode != SWT.CAPS_LOCK && e.keyCode != SWT.MOD1 && e.keyCode != SWT.MOD2 && e.keyCode != SWT.MOD3 && e.keyCode != SWT.MOD4 && e.keyCode != SWT.ALT_GR)
774775
hideContextSelector();
775776
return true;
776777
}
@@ -812,7 +813,8 @@ private boolean contextInfoPopupKeyPressed(KeyEvent e) {
812813
validateContextInformation();
813814
break;
814815
default:
815-
if (e.keyCode != SWT.CAPS_LOCK && e.keyCode != SWT.MOD1 && e.keyCode != SWT.MOD2 && e.keyCode != SWT.MOD3 && e.keyCode != SWT.MOD4)
816+
// On Linux ALT_GR is the level3 switch (at least on the US-INTL layout), when using 'include "level3(YOURKEY)"' in the xkb file
817+
if (e.keyCode != SWT.CAPS_LOCK && e.keyCode != SWT.MOD1 && e.keyCode != SWT.MOD2 && e.keyCode != SWT.MOD3 && e.keyCode != SWT.MOD4 && e.keyCode != SWT.ALT_GR)
816818
hideContextInfoPopup(true);
817819
break;
818820
}

0 commit comments

Comments
 (0)