8294254: [macOS] javax/swing/plaf/aqua/CustomComboBoxFocusTest.java failure

Backport-of: 358ac07255cc640cbcb9b0df5302d97891a34087

Author: GoeLin

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

@@ -470,12 +470,12 @@ protected Rectangle rectangleForCurrentValue() {
 
             if (comboBox.getComponentOrientation().isLeftToRight()) {
                 return new Rectangle(insets.left, insets.top + midHeight,
-                        width - (insets.left + insets.right + buttonSize) + 4,
+                        width - (insets.left + insets.right + buttonSize) + 3,
                         height - (insets.top + insets.bottom));
             }
             else {
                 return new Rectangle(insets.left + buttonSize, insets.top + midHeight,
-                        width - (insets.left + insets.right + buttonSize) + 4,
+                        width - (insets.left + insets.right + buttonSize) + 3,
                         height - (insets.top + insets.bottom));
             }
         }

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

@@ -28,12 +28,12 @@
  * @requires (os.family == "mac")
  * @summary Test verifies that combo box with custom editor renders
  *          focus ring around arrow button correctly.
- * @run     main CustomComboBoxFocusTest
+ * @run     main/othervm -Dsun.java2d.uiScale=1 CustomComboBoxFocusTest
  */
 
 import java.awt.AWTException;
-import java.awt.Component;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.GridLayout;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -44,8 +44,8 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CountDownLatch;
+
 import javax.imageio.ImageIO;
 import javax.swing.ComboBoxEditor;
 import javax.swing.JComboBox;