Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2009-08-19 19:03:01 +0000
committerMarkus Keller2009-08-19 19:03:01 +0000
commit705f123d2d893bbf25d29b1ef7d8d4867cabe393 (patch)
treeefa778be05a384d8b01edb5bb76558d4c9a5606c
parentdf7a16480f50753e669da5fa74aea683cee8fc4c (diff)
downloadeclipse.platform.text-705f123d2d893bbf25d29b1ef7d8d4867cabe393.tar.gz
eclipse.platform.text-705f123d2d893bbf25d29b1ef7d8d4867cabe393.tar.xz
eclipse.platform.text-705f123d2d893bbf25d29b1ef7d8d4867cabe393.zip
Bug 272994: [find/replace] Incremental Find Next does not let me find Option+<Key> characters
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java
index 316c0f8e16c..75f3a2d1ed1 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java
@@ -33,6 +33,7 @@ import org.eclipse.core.commands.NotHandledException;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.util.Util;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
@@ -500,7 +501,11 @@ class IncrementalFindTarget implements IFindReplaceTarget, IFindReplaceTargetExt
break;
default:
- if (event.stateMask == 0 || event.stateMask == SWT.SHIFT || event.stateMask == (SWT.ALT | SWT.CTRL)) { // SWT.ALT | SWT.CTRL covers AltGr (see bug 43049)
+ int stateMask= event.stateMask;
+ if (stateMask == 0
+ || stateMask == SWT.SHIFT
+ || !Util.isMac() && stateMask == (SWT.ALT | SWT.CTRL) // AltGr (see bug 43049)
+ || Util.isMac() && (stateMask == (SWT.ALT | SWT.SHIFT) || stateMask == SWT.ALT) ) { // special chars on Mac (bug 272994)
saveState();
addCharSearch(event.character);
event.doit= false;

Back to the top