infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-28 19:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8179027: JComboBox too small under Windows LAF

Browse Source 
Reviewed-by: prr, alexsch
This commit is contained in:
Semyon Sadetsky 2017-04-27 08:27:25 -07:00
parent 0fdde7e7b8
commit 36d2ae5ce8
2 changed files with 97 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
View File

@ -339,11 +339,16 @@ public class WindowsComboBoxUI extends BasicComboBoxUI {
public Dimension getMinimumSize( JComponent c ) {
Dimension d = super.getMinimumSize(c);
if (XPStyle.getXP() != null) {
d.width += 5;
d.width += 7;
boolean isEditable = false;
if (c instanceof JComboBox) {
isEditable = ((JComboBox) c).isEditable();
}
d.height += isEditable ? 4 : 6;
} else {
d.width += 4;
d.height += 2;
}
d.height += 2;
return d;
}

90
jdk/test/javax/swing/JComboBox/WindowsComboBoxSize/WindowsComboBoxSizeTest.java Normal file
View File

@ -0,0 +1,90 @@
/*
* Copyright (c) 2017, 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 8179027
* @requires (os.family == "windows")
* @summary JComboBox too small under Windows LAF
* @run main WindowsComboBoxSizeTest
*/
import javax.swing.*;
import java.awt.FlowLayout;
import java.awt.Robot;
public class WindowsComboBoxSizeTest {
private static JTextField textField;
private static JComboBox<String> comboBox;
private static JComboBox<String> comboBoxEd;
private static JFrame frame;
public static void main(String[] args) throws Exception {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
SwingUtilities.invokeAndWait(() -> {
frame = new JFrame();
frame.getContentPane().setLayout( new FlowLayout() );
textField = new JTextField("item 1");
frame.getContentPane().add(textField);
comboBox = new JComboBox<>(new String[]
{"item 1", "item 2", "item 3"});
frame.getContentPane().add(comboBox);
comboBoxEd = new JComboBox<>(new String[]
{"item 1", "item 2", "item 3"});
comboBoxEd.setEditable( true );
frame.getContentPane().add(comboBoxEd);
frame.pack();
frame.setVisible( true );
});
Robot robot = new Robot();
robot.waitForIdle();
try {
test();
} finally {
SwingUtilities.invokeLater(frame::dispose);
}
}
private static void test() throws Exception {
SwingUtilities.invokeAndWait(() -> {
int expected = textField.getSize().height;
if (comboBox.getSize().height != expected ) {
throw new RuntimeException(
"Wrong non-editable JComboBox height " +
comboBox.getSize().height);
}
if (comboBoxEd.getSize().height != expected ) {
throw new RuntimeException(
"Wrong editable JComboBox height " +
comboBoxEd.getSize().height);
}
});
}
}