Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 287:929bf1062f64
Merge
author | jgodinez |
---|---|
date | Thu, 10 Apr 2008 10:23:47 -0700 |
parents | e4abdd4c2303 (current diff) cae9799d0810 (diff) |
children | bda7549ac1d0 99f3a382f574 |
files | |
diffstat | 4 files changed, 242 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/awt/Font.java Wed Apr 09 15:16:57 2008 -0700 +++ b/src/share/classes/java/awt/Font.java Thu Apr 10 10:23:47 2008 -0700 @@ -711,7 +711,7 @@ EBIDI_EMBEDDING, EJUSTIFICATION, EINPUT_METHOD_HIGHLIGHT, EINPUT_METHOD_UNDERLINE, ESWAP_COLORS, ENUMERIC_SHAPING, EKERNING, - ELIGATURES, ETRACKING); + ELIGATURES, ETRACKING, ESUPERSCRIPT); private static final int EXTRA_MASK = AttributeValues.getMask(ETRANSFORM, ESUPERSCRIPT, EWIDTH);
--- a/src/share/classes/sun/font/AttributeValues.java Wed Apr 09 15:16:57 2008 -0700 +++ b/src/share/classes/sun/font/AttributeValues.java Thu Apr 10 10:23:47 2008 -0700 @@ -887,10 +887,10 @@ try { AffineTransform rtxi = rtx.createInverse(); + double dx = tx.getTranslateX(); + double dy = tx.getTranslateY(); tx.preConcatenate(rtxi); if (andTranslation) { - double dx = tx.getTranslateX(); - double dy = tx.getTranslateY(); if (dx != 0 || dy != 0) { tx.setTransform(tx.getScaleX(), tx.getShearY(), tx.getShearX(), tx.getScaleY(), 0, 0);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/Graphics2D/DrawString/DrawStrSuper.java Thu Apr 10 10:23:47 2008 -0700 @@ -0,0 +1,151 @@ +/* + * 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 + * @bug 6684056 + * @summary Super-scripted text needs to be positioned the same with + * drawString and TextLayout. + */ +import java.awt.*; +import java.awt.event.*; +import java.awt.font.*; +import static java.awt.font.TextAttribute.*; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.util.HashMap; + + +public class DrawStrSuper extends Component { + + int angle = 0; + static boolean interactive = false; + + int wid=400, hgt=400; + BufferedImage bi = null; + + void paintImage() { + + if (bi == null) { + bi = new BufferedImage(wid, hgt, BufferedImage.TYPE_INT_RGB); + } + Graphics2D g2d = bi.createGraphics(); + g2d.setColor(Color.white); + g2d.fillRect(0, 0, wid, hgt); + g2d.translate(200, 200); + + Font fnt = new Font("Arial", Font.PLAIN, 20); + fnt = fnt.deriveFont(60.0f); + HashMap attrMap = new HashMap(); + AffineTransform aff = + AffineTransform.getRotateInstance(angle * Math.PI/180.0); + attrMap.put(SUPERSCRIPT, SUPERSCRIPT_SUPER); + attrMap.put(TRANSFORM, aff); + fnt = fnt.deriveFont(attrMap); + + g2d.setFont(fnt); + g2d.setColor(Color.yellow); + TextLayout tl = new TextLayout("Text", fnt,g2d.getFontRenderContext()); + g2d.fill(tl.getBounds()); + + g2d.setColor(Color.black); + g2d.drawLine(-3, 0, 3, 0); + g2d.drawLine(0, -3, 0, 3); + + g2d.setColor(Color.blue); + g2d.drawString("Text", 0, 0); + + g2d.setColor(Color.red); + tl.draw(g2d,0f,0f); + + // Test BI: should be no blue + int blue = Color.blue.getRGB(); + for (int px=0;px<wid;px++) { + for (int py=0;py<hgt;py++) { + int rgb = bi.getRGB(px, py); + if (rgb == blue) { + throw new RuntimeException + ("Unexpected color : " + Integer.toHexString(rgb) + + " at x=" + px + " y="+ py); + } + } + } + } + + @Override + public void paint(Graphics g) { + paintImage(); + g.drawImage(bi, 0,0, null); + } + + + static class Runner extends Thread { + + DrawStrSuper dss; + + Runner(DrawStrSuper dss) { + this.dss = dss; + } + + public void run() { + while (true) { + if (!interactive && dss.angle > 360) { + return; + } + try { + Thread.sleep(100); + } catch (InterruptedException e) { + return; + } + + dss.angle += 10; + dss.repaint(); + } + } + } + + @Override + public Dimension getPreferredSize() { + return new Dimension(400, 400); + } + + public static void main(String argv[]) throws InterruptedException { + if (argv.length > 0) interactive = true; + + Frame f = new Frame("Text bounds test"); + f.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + DrawStrSuper dss = new DrawStrSuper(); + f.add(dss, BorderLayout.CENTER); + f.pack(); + f.setLocationRelativeTo(null); + f.setVisible(true); + Runner runner = new Runner(dss); + runner.start(); + runner.join(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/Graphics2D/DrawString/RotTransText.java Thu Apr 10 10:23:47 2008 -0700 @@ -0,0 +1,88 @@ +/* + * 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 + * @bug 6683472 + * @summary Transformed fonts using drawString and TextLayout should be in + * the same position. + */ + +import java.awt.*; +import java.awt.font.*; +import java.awt.geom.*; +import java.awt.image.*; +import java.util.HashMap; + +public class RotTransText { + + public static void main(String[] args) { + + int wid=400, hgt=400; + BufferedImage bi = + new BufferedImage(wid, hgt, BufferedImage.TYPE_INT_RGB); + + Graphics2D g2d = bi.createGraphics(); + + g2d.setColor(Color.white); + g2d.fillRect(0, 0, wid, hgt); + + int x=130, y=130; + String s = "Text"; + + int xt=90, yt=50; + for (int angle=0;angle<360;angle+=30) { + AffineTransform aff = AffineTransform.getTranslateInstance(50,90); + aff.rotate(angle * Math.PI/180.0); + + Font fnt = new Font("SansSerif", Font.PLAIN, 60); + fnt = fnt.deriveFont(Font.PLAIN, aff); + g2d.setFont(fnt); + g2d.setColor(Color.blue); + g2d.drawString(s, x, y); + + g2d.setColor(Color.red); + FontRenderContext frc = g2d.getFontRenderContext(); + HashMap attrMap = new HashMap(); + attrMap.put(TextAttribute.STRIKETHROUGH, + TextAttribute.STRIKETHROUGH_ON); + fnt = fnt.deriveFont(attrMap); + TextLayout tl = new TextLayout(s, fnt, frc); + tl.draw(g2d, (float)x, (float)y); + } + // Test BI: should be no blue: only red and white. + int red = Color.red.getRGB(); + int blue = Color.blue.getRGB(); + int white = Color.white.getRGB(); + for (int px=0;px<wid;px++) { + for (int py=0;py<hgt;py++) { + int rgb = bi.getRGB(px, py); + if (rgb == blue || ( rgb != red && rgb != white)) { + throw new RuntimeException + ("Unexpected color : " + Integer.toHexString(rgb) + + " at x=" + x + " y="+ y); + } + } + } + } +}