Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.
/ lanai Public archive

Commit 1ce6ec6

Browse files
committedJul 21, 2020
8199529: javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java fails on windows
Reviewed-by: serb, psadhukhan
1 parent 3ec5f6b commit 1ce6ec6

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed
 

‎test/jdk/ProblemList.txt

-1
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,6 @@ javax/swing/UIDefaults/8149879/InternalResourceBundle.java 8199054 windows-all
813813
javax/swing/text/html/parser/Parser/8078268/bug8078268.java 8199092 generic-all
814814
javax/swing/PopupFactory/8048506/bug8048506.java 8202660 windows-all
815815
javax/swing/JTextArea/TextViewOOM/TextViewOOM.java 8167355 generic-all
816-
javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java 8199529 windows-all
817816
javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java 202880 linux-all
818817
javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765 macosx-all,linux-all
819818
javax/swing/Popup/TaskbarPositionTest.java 8065097 macosx-all,linux-all

‎test/jdk/javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
*/
2323
import java.awt.Font;
2424
import java.awt.Graphics;
25+
import java.awt.Graphics2D;
26+
import java.awt.RenderingHints;
27+
import static java.awt.RenderingHints.*;
28+
import java.awt.Toolkit;
29+
import java.util.Map;
2530
import java.util.concurrent.CountDownLatch;
2631
import java.util.concurrent.TimeUnit;
2732
import javax.swing.JFrame;
@@ -31,7 +36,7 @@
3136
/**
3237
* @test
3338
* @key headful
34-
* @bug 8142966
39+
* @bug 8142966 8199529
3540
* @summary Wrong cursor position in text components on HiDPI display
3641
* @run main/othervm -Dsun.java2d.uiScale=2 SwingFontMetricsTest
3742
*/
@@ -42,8 +47,15 @@ public class SwingFontMetricsTest {
4247
private static final String TEXT = LOWER_CASE_TEXT + UPPER_CASE_TEXT;
4348
private static boolean passed = false;
4449
private static CountDownLatch latch = new CountDownLatch(1);
50+
private static Object aaHint = null;
4551

4652
public static void main(String[] args) throws Exception {
53+
Map map = (Map)Toolkit.getDefaultToolkit().getDesktopProperty("awt.font.desktophints");
54+
aaHint = map.get(RenderingHints.KEY_TEXT_ANTIALIASING);
55+
if (aaHint == null) {
56+
aaHint = VALUE_TEXT_ANTIALIAS_DEFAULT;
57+
}
58+
4759
SwingUtilities.invokeAndWait(SwingFontMetricsTest::createAndShowGUI);
4860
latch.await(5, TimeUnit.SECONDS);
4961

@@ -61,7 +73,10 @@ private static void createAndShowGUI() {
6173
public void paint(Graphics g) {
6274
super.paint(g);
6375
Font font = getFont();
76+
Graphics2D g2d = (Graphics2D)g;
6477
int width1 = getFontMetrics(font).stringWidth(TEXT);
78+
// Set the same AA hint that the built-in Swing L&Fs set.
79+
g2d.setRenderingHint(KEY_TEXT_ANTIALIASING, aaHint);
6580
int width2 = g.getFontMetrics(font).stringWidth(TEXT);
6681
passed = (width1 == width2);
6782
latch.countDown();

0 commit comments

Comments
 (0)