6751621: TextLayout.getBounds() doesn't account for strike through

Reviewed-by: igor, dougfelt

src/share/classes/sun/font/Decoration.java

@@ -267,7 +267,9 @@ public class Decoration {
             CoreMetrics cm = label.getCoreMetrics();
             if (strikethrough) {
                 Stroke savedStroke = g2d.getStroke();
-                g2d.setStroke(new BasicStroke(cm.strikethroughThickness));
+                g2d.setStroke(new BasicStroke(cm.strikethroughThickness,
+                                              BasicStroke.CAP_BUTT,
+                                              BasicStroke.JOIN_MITER));
                 float strikeY = y + cm.strikethroughOffset;
                 g2d.draw(new Line2D.Float(x1, strikeY, x2, strikeY));
                 g2d.setStroke(savedStroke);
@@ -341,7 +343,7 @@ public class Decoration {
 
             Rectangle2D visBounds = label.handleGetVisualBounds();
 
-            if (swapColors || bgPaint != null
+            if (swapColors || bgPaint != null || strikethrough
                         || stdUnderline != null || imUnderline != null) {
 
                 float minX = 0;
@@ -390,7 +392,9 @@ public class Decoration {
             }
 
             if (strikethrough) {
-                Stroke stStroke = new BasicStroke(cm.strikethroughThickness);
+                Stroke stStroke = new BasicStroke(cm.strikethroughThickness,
+                                                  BasicStroke.CAP_BUTT,
+                                                  BasicStroke.JOIN_MITER);
                 float shiftY = y + cm.strikethroughOffset;
                 Line2D line = new Line2D.Float(x1, shiftY, x2, shiftY);
                 Area slArea = new Area(stStroke.createStrokedShape(line));

src/share/classes/sun/font/Underline.java

@@ -126,7 +126,9 @@ abstract class Underline {
         private BasicStroke createStroke(float lineThickness) {
 
             if (dashPattern == null) {
-                return new BasicStroke(lineThickness);
+                return new BasicStroke(lineThickness,
+                                       BasicStroke.CAP_BUTT,
+                                       BasicStroke.JOIN_MITER);
             }
             else {
                 return new BasicStroke(lineThickness,

test/java/awt/font/TextLayout/DecorationBoundsTest.java

+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @summary verify bounds enclose rendering of decorations.
+ * @bug 6751621
+ */
+
+import java.awt.*;
+import java.awt.font.*;
+import java.awt.geom.*;
+import java.awt.image.*;
+import java.util.*;
+
+public class DecorationBoundsTest {
+
+    public static void main(String[] args) {
+        BufferedImage bi =
+           new BufferedImage(600, 300, BufferedImage.TYPE_INT_RGB);
+       Graphics2D g2d = bi.createGraphics();
+       g2d.setColor(Color.white);
+       g2d.fillRect(0, 0, 600, 300);
+
+       float x = 10;
+       float y = 90;
+       Map map = new HashMap();
+       map.put(TextAttribute.STRIKETHROUGH,
+               TextAttribute.STRIKETHROUGH_ON);
+       map.put(TextAttribute.SIZE, new Float(80));
+
+       FontRenderContext frc = g2d.getFontRenderContext();
+
+       String text = "Welcome to ";
+       TextLayout tl = new TextLayout(text, map, frc);
+       g2d.translate(x, y);
+       g2d.setColor(Color.RED);
+       tl.draw(g2d, 0, 0);
+       g2d.setColor(Color.GREEN);
+       Rectangle2D bds = tl.getBounds();
+       /* Since due to pixelisation the glyphs may touch above
+        * or below the theoretical outline bounds, pad in the
+        * y direction to avoid spurious failures.
+        */
+       bds.setRect(bds.getX(), bds.getY()-1,
+                   bds.getWidth(), bds.getHeight()+2);
+       g2d.fill(bds);
+
+       map = new HashMap();
+       map.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
+       map.put(TextAttribute.SIZE, new Float(80));
+       tl = new TextLayout(text, map, frc);
+       g2d.translate(0, 100);
+       g2d.setColor(Color.RED);
+       tl.draw(g2d, 0, 0);
+
+       g2d.setColor(Color.GREEN);
+       bds = tl.getBounds();
+       bds.setRect(bds.getX(), bds.getY()-1,
+                   bds.getWidth(), bds.getHeight()+2);
+       g2d.fill(bds);
+
+       checkBI(bi, Color.RED);
+   }
+
+   static void checkBI(BufferedImage bi, Color badColor) {
+      int badrgb = badColor.getRGB();
+      int w = bi.getWidth(null);
+      int h = bi.getHeight(null);
+      for (int x=0; x<w; x++) {
+          for (int y=0; y<h; y++) {
+             int col = bi.getRGB(x, y);
+             if (col == badrgb) {
+                  throw new RuntimeException("Got " + col);
+             }
+          }
+      }
+   }
+}