diff options
author | Markus Keller | 2010-09-07 13:44:41 +0000 |
---|---|---|
committer | Markus Keller | 2010-09-07 13:44:41 +0000 |
commit | 8e1b4a516b45d78b9b88c61816bd3a3979aa9030 (patch) | |
tree | f6f44793f1e93dea4240d927d496fea3af543c9c /org.eclipse.ui.workbench.texteditor | |
parent | aa9b29d6ab9e7fff07a206548d78bc3257a29428 (diff) | |
download | eclipse.platform.text-8e1b4a516b45d78b9b88c61816bd3a3979aa9030.tar.gz eclipse.platform.text-8e1b4a516b45d78b9b88c61816bd3a3979aa9030.tar.xz eclipse.platform.text-8e1b4a516b45d78b9b88c61816bd3a3979aa9030.zip |
Bug 324182: [find/replace] (Shift+)Enter should always execute the current default button
Diffstat (limited to 'org.eclipse.ui.workbench.texteditor')
-rw-r--r-- | org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java index 5bc9b9769a5..d0dda83a10c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java @@ -48,6 +48,7 @@ import org.eclipse.jface.fieldassist.ComboContentAdapter; import org.eclipse.jface.fieldassist.FieldDecoration; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; import org.eclipse.jface.resource.JFaceColors; +import org.eclipse.jface.util.Util; import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.FindReplaceDocumentAdapterContentProposalProvider; @@ -417,6 +418,11 @@ class FindReplaceDialog extends Dialog { panel.addTraverseListener(new TraverseListener() { public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_RETURN) { + if (!Util.isMac()) { + Control controlWithFocus= getShell().getDisplay().getFocusControl(); + if (controlWithFocus != null && (controlWithFocus.getStyle() & SWT.PUSH) == SWT.PUSH) + return; + } Event event= new Event(); event.type= SWT.Selection; event.stateMask= e.stateMask; |