stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8318590: JButton ignores margin when painting HTML text

Browse Source 
Reviewed-by: prr, azvegint, honkar
This commit is contained in:
Damon Nguyen 2023-12-05 19:25:42 +00:00
parent d3df3eb5d7
commit acaf2c8dcf
4 changed files with 16 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
View File

@ -338,20 +338,10 @@ public class AquaButtonUI extends BasicButtonUI implements Sizeable {
}
// performs icon and text rect calculations
final String text;
final Icon icon = b.getIcon();
final View v = (View)c.getClientProperty(BasicHTML.propertyKey);
if (v != null && icon == null) {
// use zero insets for HTML without an icon
// since layout only handles text calculations
text = layoutAndGetText(g, b, aquaBorder, new Insets(0,0,0,0),
viewRect, iconRect, textRect);
} else {
text = layoutAndGetText(g, b, aquaBorder, i, viewRect, iconRect, textRect);
}
final String text = layoutAndGetText(g, b, aquaBorder, i, viewRect, iconRect, textRect);
// Paint the Icon
if (icon != null) {
if (b.getIcon() != null) {
paintIcon(g, b, iconRect);
}
@ -360,6 +350,7 @@ public class AquaButtonUI extends BasicButtonUI implements Sizeable {
}
if (text != null && !text.isEmpty()) {
final View v = (View)c.getClientProperty(BasicHTML.propertyKey);
if (v != null) {
v.paint(g, textRect);
} else {

17
src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -25,8 +25,6 @@
package javax.swing.plaf.basic;
import sun.awt.AppContext;
import sun.swing.SwingUtilities2;
import java.awt.AWTKeyStroke;
import java.awt.Component;
import java.awt.Dimension;
@ -61,6 +59,9 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
import javax.swing.text.View;
import sun.awt.AppContext;
import sun.swing.SwingUtilities2;
/**
* BasicButton implementation
*
@ -598,15 +599,7 @@ public class BasicButtonUI extends ButtonUI{
private String layout(AbstractButton b, FontMetrics fm,
int width, int height) {
Insets i;
final View v = (View)b.getClientProperty(BasicHTML.propertyKey);
if (v != null) {
i = new Insets(0, 0, 0, 0);
} else {
i = b.getInsets();
}
Insets i = b.getInsets();
viewRect.x = i.left;
viewRect.y = i.top;
viewRect.width = width - (i.right + viewRect.x);

24
src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
View File

@ -24,8 +24,6 @@
*/
package javax.swing.plaf.synth;
import sun.swing.MenuItemLayoutHelper;
import sun.swing.SwingUtilities2;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
@ -37,13 +35,15 @@ import java.awt.Rectangle;
import javax.swing.ButtonModel;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JMenuItem;
import javax.swing.SwingUtilities;
import javax.swing.plaf.basic.BasicHTML;
import javax.swing.text.View;
import sun.swing.MenuItemLayoutHelper;
import sun.swing.SwingUtilities2;
/**
* Wrapper for primitive graphics calls.
*
@ -392,19 +392,10 @@ public class SynthGraphicsUtils {
FontMetrics fm = SwingUtilities2.getFontMetrics(c, g);
Insets insets = SynthLookAndFeel.getPaintingInsets(ss, paintInsets);
final View v = (View)c.getClientProperty(BasicHTML.propertyKey);
if (c instanceof JButton && v != null) {
paintViewR.x = 0;
paintViewR.y = 0;
paintViewR.width = c.getWidth();
paintViewR.height = c.getHeight();
} else {
paintViewR.x = insets.left;
paintViewR.y = insets.top;
paintViewR.width = c.getWidth() - (insets.left + insets.right);
paintViewR.height = c.getHeight() - (insets.top + insets.bottom);
}
paintViewR.x = insets.left;
paintViewR.y = insets.top;
paintViewR.width = c.getWidth() - (insets.left + insets.right);
paintViewR.height = c.getHeight() - (insets.top + insets.bottom);
paintIconR.x = paintIconR.y = paintIconR.width = paintIconR.height = 0;
paintTextR.x = paintTextR.y = paintTextR.width = paintTextR.height = 0;
@ -430,6 +421,7 @@ public class SynthGraphicsUtils {
}
if (text != null) {
View v = (View) c.getClientProperty(BasicHTML.propertyKey);
if (v != null) {
v.paint(g, paintTextR);
} else {

145
test/jdk/javax/swing/JButton/HtmlButtonImageTest/HtmlButtonImageTest.java
View File

@ -1,145 +0,0 @@
/*
* Copyright (c) 2022, 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.
*/
/*
* @test
* @bug 8015854
* @summary Tests HTML image as JButton text for unwanted padding
* @run main HtmlButtonImageTest
*/
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import javax.imageio.ImageIO;
import javax.swing.JButton;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import static java.awt.image.BufferedImage.TYPE_INT_ARGB;
public final class HtmlButtonImageTest {
private static JButton button;
private static Path testDir;
private static BufferedImage image;
private static final int BUTTON_HEIGHT = 37;
private static final int BUTTON_WIDTH = 37;
private static final int SQUARE_HEIGHT = 19;
private static final int SQUARE_WIDTH = 19;
private static final int centerX = BUTTON_WIDTH / 2;
private static final int centerY = BUTTON_HEIGHT / 2;
private static final int minX = centerX - (SQUARE_WIDTH / 2);
private static final int minY = centerY - (SQUARE_HEIGHT / 2);
private static final int maxX = centerX + (SQUARE_WIDTH / 2);
private static final int maxY = centerY + (SQUARE_HEIGHT / 2);
private static boolean supportedLaf;
private static int failCount = 0;
private static String currentLaf = new String();
private static StringBuffer failedLafs = new StringBuffer();
public static void main(String[] args) throws Exception {
testDir = Path.of(System.getProperty("test.classes", "."));
generateRedSquare();
for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
if(supportedLaf) {
currentLaf = laf.getName();
SwingUtilities.invokeAndWait(HtmlButtonImageTest::createButton);
SwingUtilities.invokeAndWait(HtmlButtonImageTest::paintButton);
testImageCentering(image.getRGB(centerX, centerY),
image.getRGB(minX, minY),
image.getRGB(minX, maxY),
image.getRGB(maxX, minY),
image.getRGB(maxX, maxY));
}
}
if(!failedLafs.isEmpty()) {
if(failCount > 1) {
failedLafs.setLength(failedLafs.length() - 2);
}
throw new RuntimeException("HTML image not centered in button " +
"for these L&F's: " + failedLafs);
}
}
private static void generateRedSquare() throws IOException {
BufferedImage bImg = new BufferedImage(SQUARE_WIDTH, SQUARE_HEIGHT,
TYPE_INT_ARGB);
Graphics2D cg = bImg.createGraphics();
cg.setColor(Color.RED);
cg.fillRect(0, 0, SQUARE_WIDTH, SQUARE_HEIGHT);
ImageIO.write(bImg, "png", new File(testDir + "/red_square.png"));
}
private static void createButton() {
button = new JButton();
button.setSize(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT));
button.setText("<html><img src='"
+ testDir.resolve("red_square.png").toUri() + "'></html>");
}
private static void paintButton() {
image = new BufferedImage(BUTTON_HEIGHT, BUTTON_WIDTH, TYPE_INT_ARGB);
Graphics2D graphics2D = image.createGraphics();
button.paint(graphics2D);
graphics2D.dispose();
}
private static boolean checkRedColor(int rgb) {
return (rgb == Color.RED.getRGB());
}
private static void testImageCentering(int... colors) throws IOException {
for (int c : colors) {
if (!checkRedColor(c)) {
failCount++;
ImageIO.write(image, "png", new File(testDir + "/fail_image_" +
currentLaf.replaceAll("[^\\w\\s]","") + ".png"));
failedLafs.append(currentLaf + ", ");
break;
}
}
}
private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
try {
UIManager.setLookAndFeel(laf.getClassName());
supportedLaf = true;
} catch (UnsupportedLookAndFeelException | ClassNotFoundException |
InstantiationException | IllegalAccessException e) {
supportedLaf = false;
}
}
}