matthiasblaesing commented on code in PR #8319:
URL: https://github.com/apache/netbeans/pull/8319#discussion_r2094114108
##########
platform/openide.awt/src/org/openide/awt/QuickSearch.java:
##########
@@ -707,9 +729,14 @@ public void processKeyEvent(KeyEvent ke) {
} else {
if (!hasSearchText) {
int keyCode = ke.getKeyCode();
+ KeyStroke ks = KeyStroke.getKeyStrokeForEvent(ke);
if (keyCode == KeyEvent.VK_DOWN || keyCode ==
KeyEvent.VK_UP ||
keyCode == KeyEvent.VK_LEFT || keyCode ==
KeyEvent.VK_RIGHT ||
- keyCode == KeyEvent.VK_TAB || keyCode ==
KeyEvent.VK_F3) {
+ keyCode == KeyEvent.VK_TAB || keyCode ==
KeyEvent.VK_F3 ||
+ keyCode == KeyEvent.VK_ENTER && ke.getModifiersEx() ==
KeyEvent.SHIFT_DOWN_MASK ||
Review Comment:
```suggestion
(keyCode == KeyEvent.VK_ENTER && ke.getModifiersEx()
== KeyEvent.SHIFT_DOWN_MASK) ||
```
##########
platform/openide.awt/src/org/openide/awt/QuickSearch.java:
##########
@@ -763,12 +791,22 @@ public void keyPressed(KeyEvent e) {
callback.quickSearchCanceled();
hasSearchText = false;
e.consume();
- } else if (keyCode == KeyEvent.VK_UP || (keyCode == KeyEvent.VK_F3
&& e.isShiftDown())) {
+ } else if (keyCode == KeyEvent.VK_UP ||
+ keyCode == KeyEvent.VK_F3 && e.getModifiersEx() ==
KeyEvent.SHIFT_DOWN_MASK ||
+ keyCode == KeyEvent.VK_ENTER && e.getModifiersEx() ==
KeyEvent.SHIFT_DOWN_MASK ||
Review Comment:
```suggestion
(keyCode == KeyEvent.VK_F3 && e.getModifiersEx() ==
KeyEvent.SHIFT_DOWN_MASK) ||
(keyCode == KeyEvent.VK_ENTER && e.getModifiersEx() ==
KeyEvent.SHIFT_DOWN_MASK) ||
```
##########
platform/openide.awt/src/org/openide/awt/QuickSearch.java:
##########
@@ -763,12 +791,22 @@ public void keyPressed(KeyEvent e) {
callback.quickSearchCanceled();
hasSearchText = false;
e.consume();
- } else if (keyCode == KeyEvent.VK_UP || (keyCode == KeyEvent.VK_F3
&& e.isShiftDown())) {
+ } else if (keyCode == KeyEvent.VK_UP ||
+ keyCode == KeyEvent.VK_F3 && e.getModifiersEx() ==
KeyEvent.SHIFT_DOWN_MASK ||
+ keyCode == KeyEvent.VK_ENTER && e.getModifiersEx() ==
KeyEvent.SHIFT_DOWN_MASK ||
+ PREVIOUS_ALTERNATIVE_KEY_STROKE.equals(ks))
+ {
fireShowNextSelection(false);
// Stop processing the event here. Otherwise it's dispatched
// to the tree too (which scrolls)
e.consume();
- } else if (keyCode == KeyEvent.VK_DOWN || keyCode ==
KeyEvent.VK_F3) {
+ } else if (keyCode == KeyEvent.VK_DOWN ||
+ keyCode == KeyEvent.VK_F3 && e.getModifiersEx() == 0 ||
+ /* We can't use ENTER to go to the next match, as this
keystroke is used to
+ invoke the row's default action. */
+ /* keyCode == KeyEvent.VK_ENTER && e.getModifiersEx() == 0
|| */
Review Comment:
Does it really make sense to handle Shift-Enter, but not Enter?
##########
platform/openide.explorer/src/org/openide/explorer/view/TableQuickSearchSupport.java:
##########
@@ -152,14 +154,18 @@ public void quickSearchConfirmed() {
quickSearchInitialColumn = -1;
}
+ private static final boolean RESTORE_PRIOR_SELECTION_AFTER_QUICK_SEARCH =
false;
Review Comment:
What is the idea here? Is this a fancy way of commenting out code?
##########
platform/openide.awt/src/org/openide/awt/QuickSearch.java:
##########
@@ -354,6 +359,23 @@ public void keyTyped(KeyEvent e) {
if(isAlwaysShown()) {
displaySearchField();
}
+ component.getActionMap().put("openQuickSearch", new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ if (searchPanel != null && isEnabled()) {
+ searchTextField.selectAll();
+ return;
+ }
+ if (searchPanel != null || !isEnabled()) {
+ return;
+ }
+ searchTextField.setText("");
+ displaySearchField();
+ }
+ });
+ InputMap im =
component.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ im.put(Utilities.stringToKey("D-F"), "openQuickSearch");
Review Comment:
This is a problem in Project and Files views in the IDE as it overrides the
project wide searches.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
