stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7148092: [macosx] When Alt+down arrow key is pressed, the combobox popup does not appear.

Browse Source 
Reviewed-by: prr, serb
This commit is contained in:
Prasanta Sadhukhan 2022-09-28 08:50:58 +00:00
parent 94e14da0ef
commit c42ef70a45
3 changed files with 128 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java
View File

@ -323,6 +323,8 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable {
actionMap.put("aquaSelectPageDown", highlightPageDownAction);
actionMap.put("aquaHidePopup", hideAction);
actionMap.put("aquaOpenPopupOrhighlightLast", openPopupOrHighlightLast);
actionMap.put("aquaOpenPopupOrhighlightFirst", openPopupOrHighlightFirst);
SwingUtilities.replaceUIActionMap(comboBox, actionMap);
}
@ -604,6 +606,27 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable {
}
};
@SuppressWarnings("serial") // anonymous class
private final Action openPopupOrHighlightLast = new ComboBoxAction() {
@Override
void performComboBoxAction(final AquaComboBoxUI ui) {
final int size = listBox.getModel().getSize();
listBox.setSelectedIndex(size - 1);
listBox.ensureIndexIsVisible(size - 1);
comboBox.setSelectedIndex(ui.getPopup().getList().getSelectedIndex());
}
};
@SuppressWarnings("serial") // anonymous class
private final Action openPopupOrHighlightFirst = new ComboBoxAction() {
@Override
void performComboBoxAction(final AquaComboBoxUI ui) {
listBox.setSelectedIndex(0);
listBox.ensureIndexIsVisible(0);
comboBox.setSelectedIndex(ui.getPopup().getList().getSelectedIndex());
}
};
public void applySizeFor(final JComponent c, final Size size) {
if (arrowButton == null) return;
final Border border = arrowButton.getBorder();

4
src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
View File

@ -222,6 +222,10 @@ public class AquaKeyBindings {
"KP_UP", "aquaSelectPrevious",
"DOWN", "aquaSelectNext",
"KP_DOWN", "aquaSelectNext",
"alt DOWN", "aquaOpenPopupOrhighlightLast",
"alt KP_DOWN", "aquaOpenPopupOrhighlightLast",
"alt UP", "aquaOpenPopupOrhighlightFirst",
"alt KP_UP", "aquaOpenPopupOrhighlightFirst",
"SPACE", "aquaSpacePressed" // "spacePopup"
}));
}

101
test/jdk/javax/swing/plaf/aqua/TestAltUpDownComboBox.java Normal file
View File

@ -0,0 +1,101 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 7148092
* @requires (os.family == "mac")
* @summary Tests that alt+down arrow pulls down JComboBox popup
* @key headful
* @run main TestAltUpDownComboBox
*/
import java.awt.Container;
import java.awt.Robot;
import java.awt.event.KeyEvent;
import javax.swing.BoxLayout;
import javax.swing.JFrame;
import javax.swing.JComboBox;
import javax.swing.SwingUtilities;
public class TestAltUpDownComboBox {
private static JFrame frame;
private static JComboBox combo;
public static void main(String[] argv) throws Exception {
Robot robot = new Robot();
robot.setAutoDelay(100);
try {
SwingUtilities.invokeAndWait(() -> {
frame = new JFrame("");
Object[] fruits = {"Banana", "Pear", "Apple"};
combo = new JComboBox(fruits);
Container pane = frame.getContentPane();
pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS));
pane.add(combo);
frame.pack();
frame.setLocationRelativeTo(null);
frame.setVisible(true);
});
robot.waitForIdle();
robot.delay(1000);
robot.keyPress(KeyEvent.VK_ALT);
robot.keyPress(KeyEvent.VK_DOWN);
robot.keyRelease(KeyEvent.VK_DOWN);
robot.keyRelease(KeyEvent.VK_ALT);
robot.delay(1000);
if (!combo.isPopupVisible()) {
throw new RuntimeException("comboBox is not visible");
}
robot.keyPress(KeyEvent.VK_ALT);
robot.keyPress(KeyEvent.VK_DOWN);
robot.keyRelease(KeyEvent.VK_DOWN);
robot.keyRelease(KeyEvent.VK_ALT);
robot.delay(1000);
if (combo.getSelectedIndex() != combo.getItemCount() - 1) {
System.out.println(combo.getSelectedIndex());
throw new RuntimeException("Alt+Down did not select last entry");
}
robot.keyPress(KeyEvent.VK_ALT);
robot.keyPress(KeyEvent.VK_UP);
robot.keyRelease(KeyEvent.VK_UP);
robot.keyRelease(KeyEvent.VK_ALT);
robot.delay(1000);
if (combo.getSelectedIndex() != 0) {
System.out.println(combo.getSelectedIndex());
throw new RuntimeException("Alt+Up did not select first entry");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (frame != null) {
frame.dispose();
}
});
}
}
}