8233068: HIDPI: Linux: AWT Checkbox check mark is unscaled
Reviewed-by: jdv, abhiscxk, honkar
This commit is contained in:
parent
a9460a69e7
commit
3bc4a1acc4
src/java.desktop/unix/classes/sun/awt/X11
test/jdk/java/awt/Checkbox
@ -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);
|
||||
}
|
||||
|
92
test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java
Normal file
92
test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java
Normal file
@ -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();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user