diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java index 0adf45df1ff..ee50976bbf4 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java @@ -215,9 +215,12 @@ public class SynthProgressBarUI extends BasicProgressBarUI SynthContext context = getContext(c); SynthLookAndFeel.update(context, g); - context.getPainter().paintProgressBarBackground(context, - g, 0, 0, c.getWidth(), c.getHeight(), - progressBar.getOrientation()); + + if (((JProgressBar) c).isBorderPainted()) { + context.getPainter().paintProgressBarBackground(context, + g, 0, 0, c.getWidth(), c.getHeight(), + progressBar.getOrientation()); + } paint(context, g); } diff --git a/test/jdk/javax/swing/JProgressBar/TestProgressBarBorder.java b/test/jdk/javax/swing/JProgressBar/TestProgressBarBorder.java new file mode 100644 index 00000000000..06ccfc3b9bf --- /dev/null +++ b/test/jdk/javax/swing/JProgressBar/TestProgressBarBorder.java @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2023, 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.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.awt.Graphics; +import java.awt.image.BufferedImage; +import javax.imageio.ImageIO; +import javax.swing.JComponent; +import javax.swing.JProgressBar; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; + +import static java.awt.image.BufferedImage.TYPE_INT_RGB; + +/* + * @test + * @bug 8224261 + * @key headful + * @library ../regtesthelpers + * @build Util + * @summary Verifies JProgressBar border is not painted when border + * painting is set to false + * @run main TestProgressBarBorder + */ + +public class TestProgressBarBorder { + public static void main(String[] args) throws Exception { + for (UIManager.LookAndFeelInfo laf : + UIManager.getInstalledLookAndFeels()) { + if (!laf.getName().contains("Nimbus") && !laf.getName().contains("GTK")) { + continue; + } + System.out.println("Testing LAF: " + laf.getName()); + SwingUtilities.invokeAndWait(() -> test(laf)); + } + } + + private static void test(UIManager.LookAndFeelInfo laf) { + setLookAndFeel(laf); + JProgressBar progressBar = createProgressBar(); + progressBar.setBorderPainted(true); + BufferedImage withBorder = paintToImage(progressBar); + progressBar.setBorderPainted(false); + BufferedImage withoutBorder = paintToImage(progressBar); + + boolean equal = Util.compareBufferedImages(withBorder, withoutBorder); + if (equal) { + try { + ImageIO.write(withBorder, "png", new File("withBorder.png")); + ImageIO.write(withoutBorder, "png", new File("withoutBorder.png")); + } catch (IOException ignored) {} + + throw new RuntimeException("JProgressBar border is painted when border " + + "painting is set to false"); + } + } + + private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) { + try { + UIManager.setLookAndFeel(laf.getClassName()); + } catch (UnsupportedLookAndFeelException ignored) { + System.out.println("Unsupported LAF: " + laf.getClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + private static JProgressBar createProgressBar() { + JProgressBar progressBar = new JProgressBar(); + progressBar.setSize(100, 50); + progressBar.setValue(0); + progressBar.setStringPainted(true); + return progressBar; + } + + private static BufferedImage paintToImage(JComponent content) { + BufferedImage im = new BufferedImage(content.getWidth(), content.getHeight(), + TYPE_INT_RGB); + Graphics g = im.getGraphics(); + content.paint(g); + g.dispose(); + return im; + } +}