From c45a1f1bb0f5252e00c0dc2e5c0675e31a99b502 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Sun, 2 Oct 2016 18:08:04 +0300 Subject: [PATCH] #781 Object list searcher - handle CR, UP and DOWN keys. Former-commit-id: f326b3f3b4ace0439cae9583b04e70508d159621 --- .../ui/controls/ProgressPageControl.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ProgressPageControl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ProgressPageControl.java index a07544f5cc..82144f1ffc 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ProgressPageControl.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ProgressPageControl.java @@ -329,12 +329,20 @@ public class ProgressPageControl extends Composite implements ISearchContextProv searchText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); searchText.addKeyListener(new KeyAdapter() { @Override - public void keyReleased(KeyEvent e) - { - if (e.character == SWT.ESC) { - cancelSearch(true); - } else if (e.character == SWT.CR) { - performSearch(SearchType.NEXT); + public void keyPressed(KeyEvent e) { + switch (e.keyCode) { + case SWT.ESC: + cancelSearch(true); + break; + case SWT.CR: + case SWT.ARROW_UP: + case SWT.ARROW_DOWN: + if (childPageControl != null) { + childPageControl.setFocus(); + } + e.doit = false; + //performSearch(SearchType.NEXT); + break; } } }); -- GitLab