8318590: JButton ignores margin when painting HTML text

Reviewed-by: prr, azvegint, honkar

Author: Damon Nguyen

src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java

@@ -338,20 +338,10 @@ public void paint(final Graphics g, final JComponent c) {
         }
 
         // 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 void paint(final Graphics g, final JComponent c) {
         }
 
         if (text != null && !text.isEmpty()) {
+            final View v = (View)c.getClientProperty(BasicHTML.propertyKey);
             if (v != null) {
                 v.paint(g, textRect);
             } else {

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

@@ -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.UIResource;
 import javax.swing.text.View;
 
+import sun.awt.AppContext;
+import sun.swing.SwingUtilities2;
+
 /**
  * BasicButton implementation
  *
@@ -598,15 +599,7 @@ public Component.BaselineResizeBehavior getBaselineResizeBehavior(
 
     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);

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

@@ -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 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 void paintText(SynthContext ss, Graphics g, String text,
         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 void paintText(SynthContext ss, Graphics g, String text,
         }
 
         if (text != null) {
+            View v = (View) c.getClientProperty(BasicHTML.propertyKey);
             if (v != null) {
                 v.paint(g, paintTextR);
             } else {