Merge pull request #71 from afffsdd/master

Fix navigation pane typing behavior
This commit is contained in:
Kalen (Konloch) Kinloch 2015-07-30 11:26:43 -06:00
commit a654899888
2 changed files with 24 additions and 3 deletions

4
.gitignore vendored
View file

@ -1,3 +1,5 @@
/bin/ /bin/
.classpath .classpath
.project .project
*.iml
.idea/

View file

@ -48,6 +48,7 @@ import the.bytecode.club.bytecodeviewer.*;
* *
* @author Konloch * @author Konloch
* @author WaterWolf * @author WaterWolf
* @author afffsdd
* *
*/ */
@ -64,6 +65,7 @@ public class FileNavigationPane extends VisibleComponent implements
MyTree tree = new MyTree(treeRoot); MyTree tree = new MyTree(treeRoot);
final String quickSearchText = "Quick file search (no file extension)"; final String quickSearchText = "Quick file search (no file extension)";
final JTextField quickSearch = new JTextField(quickSearchText); final JTextField quickSearch = new JTextField(quickSearchText);
boolean cancel = false;
public KeyAdapter search = new KeyAdapter() { public KeyAdapter search = new KeyAdapter() {
@Override @Override
@ -191,6 +193,10 @@ public class FileNavigationPane extends VisibleComponent implements
this.tree.addTreeSelectionListener(new TreeSelectionListener() { this.tree.addTreeSelectionListener(new TreeSelectionListener() {
@Override @Override
public void valueChanged(final TreeSelectionEvent arg0) { public void valueChanged(final TreeSelectionEvent arg0) {
if (cancel) {
cancel = false;
return;
}
openPath(arg0.getPath()); openPath(arg0.getPath());
} }
}); });
@ -203,11 +209,24 @@ public class FileNavigationPane extends VisibleComponent implements
MyTree tree = (MyTree) arg0.getSource(); MyTree tree = (MyTree) arg0.getSource();
openPath(tree.getSelectionPath()); openPath(tree.getSelectionPath());
} }
} else {
cancel = true;
} }
} }
@Override public void keyPressed(KeyEvent arg0) { } @Override
@Override public void keyTyped(KeyEvent arg0) { } public void keyTyped(KeyEvent e) {
quickSearch.grabFocus();
quickSearch.setText("" + e.getKeyChar()); // fuck
cancel = true;
}
@Override
public void keyPressed(KeyEvent e) {
quickSearch.grabFocus();
quickSearch.setText("" + e.getKeyChar()); // fuck
cancel = true;
}
}); });
quickSearch.addKeyListener(search); quickSearch.addKeyListener(search);