git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into feature/JAL-2587
[jalview.git]
/
src
/
jalview
/
jbgui
/
GFinder.java
diff --git
a/src/jalview/jbgui/GFinder.java
b/src/jalview/jbgui/GFinder.java
index
00b4fdc
..
c335b33
100755
(executable)
--- a/
src/jalview/jbgui/GFinder.java
+++ b/
src/jalview/jbgui/GFinder.java
@@
-33,6
+33,7
@@
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JButton;
import javax.swing.JCheckBox;
@@
-142,7
+143,15
@@
public class GFinder extends JPanel
textfield_caretUpdate(e);
}
});
textfield_caretUpdate(e);
}
});
-
+ searchBox.getEditor().getEditorComponent()
+ .addKeyListener(new java.awt.event.KeyAdapter()
+ {
+ @Override
+ public void keyPressed(KeyEvent e)
+ {
+ textfield_keyPressed(e);
+ }
+ });
mainBorderLayout.setHgap(5);
mainBorderLayout.setVgap(5);
jPanel4.setLayout(borderLayout2);
mainBorderLayout.setHgap(5);
mainBorderLayout.setVgap(5);
jPanel4.setLayout(borderLayout2);
@@
-176,6
+185,18
@@
public class GFinder extends JPanel
jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
}
jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
}
+ protected void textfield_keyPressed(KeyEvent e)
+ {
+ if (e.getKeyCode() == KeyEvent.VK_ENTER)
+ {
+ if (!searchBox.isPopupVisible())
+ {
+ e.consume();
+ findNext_actionPerformed(null);
+ }
+ }
+ }
+
protected void findNext_actionPerformed(ActionEvent e)
{
}
protected void findNext_actionPerformed(ActionEvent e)
{
}