Skip to content

Commit 358ac07

Browse files
Damon Nguyenjayathirthrao
Damon Nguyen
authored andcommitted
8294254: [macOS] javax/swing/plaf/aqua/CustomComboBoxFocusTest.java failure
Reviewed-by: jdv, achung
1 parent 490fcd0 commit 358ac07

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,12 @@ protected Rectangle rectangleForCurrentValue() {
470470

471471
if (comboBox.getComponentOrientation().isLeftToRight()) {
472472
return new Rectangle(insets.left, insets.top + midHeight,
473-
width - (insets.left + insets.right + buttonSize) + 4,
473+
width - (insets.left + insets.right + buttonSize) + 3,
474474
height - (insets.top + insets.bottom));
475475
}
476476
else {
477477
return new Rectangle(insets.left + buttonSize, insets.top + midHeight,
478-
width - (insets.left + insets.right + buttonSize) + 4,
478+
width - (insets.left + insets.right + buttonSize) + 3,
479479
height - (insets.top + insets.bottom));
480480
}
481481
}

test/jdk/ProblemList.txt

-1
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,6 @@ javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
662662
javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all
663663
javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765 macosx-all,linux-all
664664
javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all
665-
javax/swing/plaf/aqua/CustomComboBoxFocusTest.java 8294254 macosx-all
666665
javax/swing/JRadioButton/4314194/bug4314194.java 8295006 linux-all
667666

668667
# Several tests which fail on some hidpi systems/macosx12-aarch64 system

test/jdk/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
* @requires (os.family == "mac")
2929
* @summary Test verifies that combo box with custom editor renders
3030
* focus ring around arrow button correctly.
31-
* @run main CustomComboBoxFocusTest
31+
* @run main/othervm -Dsun.java2d.uiScale=1 CustomComboBoxFocusTest
3232
*/
3333

3434
import java.awt.AWTException;
35-
import java.awt.Component;
3635
import java.awt.Color;
36+
import java.awt.Component;
3737
import java.awt.GridLayout;
3838
import java.awt.Point;
3939
import java.awt.Rectangle;
@@ -44,8 +44,8 @@
4444
import java.awt.image.BufferedImage;
4545
import java.io.File;
4646
import java.io.IOException;
47-
import java.lang.reflect.InvocationTargetException;
4847
import java.util.concurrent.CountDownLatch;
48+
4949
import javax.imageio.ImageIO;
5050
import javax.swing.ComboBoxEditor;
5151
import javax.swing.JComboBox;

0 commit comments

Comments
 (0)