Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8216358: [accessibility] [macos] The focus is invisible when tab to "Image Radio Buttons" and "Image CheckBoxes" #2384

Closed
wants to merge 4 commits into from
+117 −2
Closed

8216358: [accessibility] [macos] The focus is invisible when tab to "Image Radio Buttons" and "Image CheckBoxes" #2384

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95d09fa
8216358: [accessibility] [macos] The focus is invisible when tab to "…
azuev-java Feb 3, 2021
2b32184
Test simplification.
azuev-java Feb 4, 2021
20f2478
Removing unneeded try/catch block from the test.
azuev-java Feb 5, 2021
268fb77
Remove leftovers from last experiments.
azuev-java Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
113 test/jdk/javax/swing/JCheckBox/ImageCheckboxFocus/ImageCheckboxTest.java
View file
Open in desktop
@@ -21,111 +21,51 @@
* questions.
*/

import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.File;
import javax.imageio.ImageIO;
import javax.swing.BoxLayout;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import javax.swing.WindowConstants;

import static java.awt.event.KeyEvent.VK_TAB;

/*
* @test
* @key headful
* @bug 8216358
* @summary [macos] The focus is invisible when tab to "Image Radio Buttons" and "Image CheckBoxes"
* @library ../../regtesthelpers/
* @library /lib/client/
* @build Util
* @build ExtendedRobot
* @run main ImageCheckboxTest
*/

public class ImageCheckboxTest {
private static JFrame frame;
private static JButton testButton;
private static int locx, locy, frw, frh;

public static void main(String[] args) throws Exception {
new ImageCheckboxTest().performTest();
}

public void performTest() throws Exception {
try {
BufferedImage imageFocus1 = null;
BufferedImage imageFocus2 = null;
ExtendedRobot robot = new ExtendedRobot();

SwingUtilities.invokeAndWait(() -> {
frame = new JFrame("Test frame");
JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
testButton = new JButton("Start");
panel.add(testButton);
for (int i = 1; i < 6; i++) {
JCheckBox cb = new JCheckBox(" Box No. " + i, new MyIcon(Color.GREEN));
panel.add(cb);
}

frame.setLayout(new BorderLayout());
frame.add(panel, BorderLayout.CENTER);
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
frame.setLocationRelativeTo(null);
frame.pack();
frame.setVisible(true);

});
robot.setAutoDelay(200);
robot.delay(1000);
robot.waitForIdle(1000);

Rectangle bounds = frame.getBounds();
Insets insets = frame.getInsets();
locx = bounds.x + insets.left;
locy = bounds.y + insets.top;
frw = bounds.width - insets.left - insets.right;
frh = bounds.height - insets.top - insets.bottom;

Point btnLoc = testButton.getLocationOnScreen();
robot.mouseMove(btnLoc.x + 10, btnLoc.y + 10);
robot.click();

robot.keyPress(VK_TAB);
robot.keyRelease(VK_TAB);

robot.delay(1000);

imageFocus1 = robot.createScreenCapture(new Rectangle(locx, locy, frw, frh));

robot.keyPress(VK_TAB);
robot.keyRelease(VK_TAB);

robot.delay(1000);

imageFocus2 = robot.createScreenCapture(new Rectangle(locx, locy, frw, frh));

if (Util.compareBufferedImages(imageFocus1, imageFocus2)) {
ImageIO.write(imageFocus1, "png", new File("imageFocus1.png"));
ImageIO.write(imageFocus2, "png", new File("imageFocus2.png"));
BufferedImage imageNoFocus = new BufferedImage(100, 50,
BufferedImage.TYPE_INT_ARGB);
BufferedImage imageFocus = new BufferedImage(100, 50,
BufferedImage.TYPE_INT_ARGB);

CustomCheckBox checkbox = new CustomCheckBox("Test", new MyIcon(Color.GREEN));
checkbox.setSize(100, 50);
checkbox.setFocused(false);
checkbox.paint(imageNoFocus.createGraphics());
checkbox.setFocused(true);
checkbox.paint(imageFocus.createGraphics());

if (Util.compareBufferedImages(imageFocus, imageNoFocus)) {
ImageIO.write(imageFocus, "png", new File("imageFocus.png"));
ImageIO.write(imageNoFocus, "png", new File("imageNoFocus.png"));
throw new Exception("Changing focus is not visualized");
}
} finally {
Copy link
Member

@mrserb mrserb Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try/finally block is not needed?

Copy link
Member Author

@azuev-java azuev-java Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, forgot to remove it. Not that it makes test invalid, but better get rid of it. Fixed.

Copy link
Member

@mrserb mrserb Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine, I assume that this test was checked via mach5 since the fix is in aqua and the test is cross-platform.

Copy link
Member Author

@azuev-java azuev-java Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, did two separate runs - with and without actual fix applied. Fails without the fix on mac os x, passes with the fix on all platforms.

if (frame != null) {
frame.dispose();
}
}
}

@@ -153,4 +93,25 @@ public int getIconHeight() {
return 18;
}
}

class CustomCheckBox extends JCheckBox {
public CustomCheckBox(String label, Icon icon) {
super(label, icon);
}

private boolean focused = false;
public void setFocused(boolean focused) {
this.focused = focused;
}

@Override
public boolean hasFocus() {
return focused;
}

@Override
public Dimension getMaximumSize() {
return new Dimension(4, 4);
}
}
}