Skip to content

Commit acc8571

Browse files
frauzufallctrueden
authored andcommitted
searchbar: release focus on ESC
1 parent 58ee44c commit acc8571

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/main/java/org/scijava/ui/swing/search/SwingSearchBar.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@
3434
import java.awt.BorderLayout;
3535
import java.awt.Color;
3636
import java.awt.Component;
37-
import java.awt.Container;
3837
import java.awt.Dimension;
3938
import java.awt.GridLayout;
4039
import java.awt.Window;
4140
import java.awt.event.FocusEvent;
4241
import java.awt.event.FocusListener;
4342
import java.awt.event.KeyAdapter;
4443
import java.awt.event.KeyEvent;
45-
import java.awt.event.KeyListener;
4644
import java.net.URL;
4745
import java.util.Collections;
4846
import java.util.Comparator;
@@ -52,13 +50,11 @@
5250
import java.util.function.Function;
5351
import java.util.stream.Collectors;
5452

55-
import javax.swing.AbstractButton;
5653
import javax.swing.Box;
5754
import javax.swing.BoxLayout;
5855
import javax.swing.DefaultListModel;
5956
import javax.swing.ImageIcon;
6057
import javax.swing.JButton;
61-
import javax.swing.JComboBox;
6258
import javax.swing.JDialog;
6359
import javax.swing.JLabel;
6460
import javax.swing.JList;
@@ -68,6 +64,7 @@
6864
import javax.swing.JTextField;
6965
import javax.swing.ScrollPaneConstants;
7066
import javax.swing.SwingConstants;
67+
import javax.swing.SwingUtilities;
7168
import javax.swing.border.CompoundBorder;
7269
import javax.swing.border.EmptyBorder;
7370
import javax.swing.border.MatteBorder;
@@ -253,6 +250,8 @@ private void reset() {
253250
searchPanel = null;
254251
dialog.dispose();
255252
dialog = null;
253+
}else{
254+
SwingUtilities.getWindowAncestor(this).requestFocusInWindow();
256255
}
257256
if (!getText().isEmpty()) setText("");
258257
else {

0 commit comments

Comments
 (0)