From 3bc4a1acc4bb1885ddba69283b99bbe02f8e43b7 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Thu, 8 Aug 2024 10:40:56 +0000
Subject: [PATCH] 8233068: HIDPI: Linux: AWT Checkbox check mark is unscaled

Reviewed-by: jdv, abhiscxk, honkar
---
 .../classes/sun/awt/X11/XCheckboxPeer.java    |  9 +-
 .../Checkbox/CheckboxCheckerScalingTest.java  | 92 +++++++++++++++++++
 2 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
index 88f1784889e..c66cda16443 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -362,12 +362,15 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
 
             if (armed | selected) {
                 //Paint the check
+                AffineTransform af = g2.getTransform();
+                double scaleX = af.getScaleX();
+                double scaleY = af.getScaleY();
 
                 // FIXME: is this the right color?
                 g2.setColor(getPeerForeground());
 
-                AffineTransform af = g2.getTransform();
-                g2.setTransform(AffineTransform.getTranslateInstance(rx,ry));
+                g2.setTransform(AffineTransform.getTranslateInstance(rx * scaleX, ry * scaleY));
+                g2.scale(scaleX, scaleY);
                 g2.fill(myCheckMark);
                 g2.setTransform(af);
             }
diff --git a/test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java b/test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java
new file mode 100644
index 00000000000..5e531e84801
--- /dev/null
+++ b/test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+import java.awt.Checkbox;
+import java.awt.Color;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.image.BufferedImage;
+
+/*
+ * @test
+ * @key headful
+ * @bug 8233068
+ * @summary Tests checkbox checker on scaling
+ * @requires (os.family == "linux")
+ * @run main CheckboxCheckerScalingTest
+ */
+
+public class CheckboxCheckerScalingTest {
+    private static Frame frame;
+    private static Checkbox checkbox;
+    private static BufferedImage imageAfterChecked;
+    private static volatile boolean checkmarkFound = false;
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("sun.java2d.uiScale", "2");
+        Robot robot = new Robot();
+        try {
+            EventQueue.invokeAndWait(() -> {
+                frame = new Frame("ComboBox checker scaling test");
+                checkbox = new Checkbox("one");
+                checkbox.setState(true);
+                frame.add(checkbox);
+                frame.pack();
+                frame.setVisible(true);
+            });
+
+            robot.waitForIdle();
+            robot.delay(100);
+            EventQueue.invokeAndWait(() -> {
+                Point point = checkbox.getLocationOnScreen();
+                Rectangle rect = new Rectangle(point.x + 5, point.y + 7, 8, 8);
+                imageAfterChecked = robot.createScreenCapture(rect);
+
+                check: {
+                    for (int i = 0; i < imageAfterChecked.getHeight(); i++) {
+                        for (int j = 0; j < imageAfterChecked.getWidth(); j++) {
+                            if (Color.black.getRGB() == imageAfterChecked.getRGB(i, j)) {
+                                checkmarkFound = true;
+                                break check;
+                            }
+                        }
+                    }
+                }
+            });
+
+            if (!checkmarkFound) {
+                throw new RuntimeException("Checkmark not scaled");
+            }
+            System.out.println("Test Passed");
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}