From 7c2929aaf803bced5b3b7edb50e164e6267aaddf Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 20 May 2010 20:42:56 +0400 Subject: [PATCH] 6910490: MatteBorder JScrollpane interaction Reviewed-by: alexp --- .../javax/swing/border/MatteBorder.java | 67 ++++------------ jdk/test/javax/swing/border/Test6910490.html | 9 +++ jdk/test/javax/swing/border/Test6910490.java | 77 +++++++++++++++++++ 3 files changed, 102 insertions(+), 51 deletions(-) create mode 100644 jdk/test/javax/swing/border/Test6910490.html create mode 100644 jdk/test/javax/swing/border/Test6910490.java diff --git a/jdk/src/share/classes/javax/swing/border/MatteBorder.java b/jdk/src/share/classes/javax/swing/border/MatteBorder.java index 5cc89da6509..511986d8a18 100644 --- a/jdk/src/share/classes/javax/swing/border/MatteBorder.java +++ b/jdk/src/share/classes/javax/swing/border/MatteBorder.java @@ -1,5 +1,5 @@ /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1997-2010 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 @@ -26,7 +26,6 @@ package javax.swing.border; import java.awt.Graphics; import java.awt.Insets; -import java.awt.Rectangle; import java.awt.Component; import java.awt.Color; @@ -133,63 +132,29 @@ public class MatteBorder extends EmptyBorder g.fillRect(width - insets.right, 0, insets.right, height - insets.bottom); } else if (tileIcon != null) { - int tileW = tileIcon.getIconWidth(); int tileH = tileIcon.getIconHeight(); - int xpos, ypos, startx, starty; - Graphics cg; - - // Paint top matte edge - cg = g.create(); - cg.setClip(0, 0, width, insets.top); - for (ypos = 0; insets.top - ypos > 0; ypos += tileH) { - for (xpos = 0; width - xpos > 0; xpos += tileW) { - tileIcon.paintIcon(c, cg, xpos, ypos); - } - } - cg.dispose(); - - // Paint left matte edge - cg = g.create(); - cg.setClip(0, insets.top, insets.left, height - insets.top); - starty = insets.top - (insets.top%tileH); - startx = 0; - for (ypos = starty; height - ypos > 0; ypos += tileH) { - for (xpos = startx; insets.left - xpos > 0; xpos += tileW) { - tileIcon.paintIcon(c, cg, xpos, ypos); - } - } - cg.dispose(); - - // Paint bottom matte edge - cg = g.create(); - cg.setClip(insets.left, height - insets.bottom, width - insets.left, insets.bottom); - starty = (height - insets.bottom) - ((height - insets.bottom)%tileH); - startx = insets.left - (insets.left%tileW); - for (ypos = starty; height - ypos > 0; ypos += tileH) { - for (xpos = startx; width - xpos > 0; xpos += tileW) { - tileIcon.paintIcon(c, cg, xpos, ypos); - } - } - cg.dispose(); - - // Paint right matte edge - cg = g.create(); - cg.setClip(width - insets.right, insets.top, insets.right, height - insets.top - insets.bottom); - starty = insets.top - (insets.top%tileH); - startx = width - insets.right - ((width - insets.right)%tileW); - for (ypos = starty; height - ypos > 0; ypos += tileH) { - for (xpos = startx; width - xpos > 0; xpos += tileW) { - tileIcon.paintIcon(c, cg, xpos, ypos); - } - } - cg.dispose(); + paintEdge(c, g, 0, 0, width - insets.right, insets.top, tileW, tileH); + paintEdge(c, g, 0, insets.top, insets.left, height - insets.top, tileW, tileH); + paintEdge(c, g, insets.left, height - insets.bottom, width - insets.left, insets.bottom, tileW, tileH); + paintEdge(c, g, width - insets.right, 0, insets.right, height - insets.bottom, tileW, tileH); } g.translate(-x, -y); g.setColor(oldColor); } + private void paintEdge(Component c, Graphics g, int x, int y, int width, int height, int tileW, int tileH) { + g = g.create(x, y, width, height); + int sY = -(y % tileH); + for (x = -(x % tileW); x < width; x += tileW) { + for (y = sY; y < height; y += tileH) { + this.tileIcon.paintIcon(c, g, x, y); + } + } + g.dispose(); + } + /** * Reinitialize the insets parameter with this Border's current Insets. * @param c the component for which this border insets value applies diff --git a/jdk/test/javax/swing/border/Test6910490.html b/jdk/test/javax/swing/border/Test6910490.html new file mode 100644 index 00000000000..4358cf471f9 --- /dev/null +++ b/jdk/test/javax/swing/border/Test6910490.html @@ -0,0 +1,9 @@ + + +If the border is painted over scroll bars then test fails. +Otherwise test passes. + + + + + diff --git a/jdk/test/javax/swing/border/Test6910490.java b/jdk/test/javax/swing/border/Test6910490.java new file mode 100644 index 00000000000..560ec6defac --- /dev/null +++ b/jdk/test/javax/swing/border/Test6910490.java @@ -0,0 +1,77 @@ +/* + * Copyright 2010 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. + */ + +import static java.awt.Color.RED; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Insets; +import javax.swing.Icon; +import javax.swing.JApplet; +import javax.swing.JButton; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.border.MatteBorder; + +/* + * @test + * @bug 6910490 + * @summary Tests a matte border around a component inside a scroll pane. + * @author Sergey Malenkov + * @run applet/manual=yesno Test6910490.html + */ + +public class Test6910490 extends JApplet implements Icon { + + @Override + public void init() { + Insets insets = new Insets(10, 10, 10, 10); + Dimension size = new Dimension(getWidth() / 2, getHeight()); + JSplitPane pane = new JSplitPane( + JSplitPane.HORIZONTAL_SPLIT, + create("Color", size, new MatteBorder(insets, RED)), + create("Icon", size, new MatteBorder(insets, this))); + pane.setDividerLocation(size.width - pane.getDividerSize() / 2); + add(pane); + } + + private JScrollPane create(String name, Dimension size, MatteBorder border) { + JButton button = new JButton(name); + button.setPreferredSize(size); + button.setBorder(border); + return new JScrollPane(button); + } + + public int getIconWidth() { + return 10; + } + + public int getIconHeight() { + return 10; + } + + public void paintIcon(Component c, Graphics g, int x, int y) { + g.setColor(RED); + g.fillRect(x, y, getIconWidth(), getIconHeight()); + } +}