diff options
author | Roman Kennke <roman@kennke.org> | 2005-07-15 14:55:24 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2005-07-15 14:55:24 +0000 |
commit | 80a30119bdab31c1ebcfc4b877ba3978a13e469a (patch) | |
tree | 9ba4db08d1b54c778499eea612be2cfae2cd53bd | |
parent | c27246a3332c5d3617d9b9834ace23954bd407cb (diff) | |
download | classpath-80a30119bdab31c1ebcfc4b877ba3978a13e469a.tar.gz |
2005-07-15 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/metal/MetalCheckBoxIcon.java:
New class. An icon implementation for use in JCheckBoxes.
* javax/swing/plaf/metal/MetalBorders.java
Renamed MetalButtonBorder to ButtonBorder.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | javax/swing/plaf/metal/MetalBorders.java | 8 | ||||
-rw-r--r-- | javax/swing/plaf/metal/MetalCheckBoxIcon.java | 136 |
3 files changed, 147 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2005-07-15 Roman Kennke <roman@kennke.org> + + * javax/swing/plaf/metal/MetalCheckBoxIcon.java: + New class. An icon implementation for use in JCheckBoxes. + * javax/swing/plaf/metal/MetalBorders.java + Renamed MetalButtonBorder to ButtonBorder. + 2005-07-15 Anthony Balkissoon <abalkiss@redhat.com> * javax/swing/plaf/basic/BasicTextUI.java: diff --git a/javax/swing/plaf/metal/MetalBorders.java b/javax/swing/plaf/metal/MetalBorders.java index e9c4bc0cf..f260ef6e3 100644 --- a/javax/swing/plaf/metal/MetalBorders.java +++ b/javax/swing/plaf/metal/MetalBorders.java @@ -78,7 +78,7 @@ public class MetalBorders /** * The border that is drawn around Swing buttons. */ - public static class MetalButtonBorder + public static class ButtonBorder extends AbstractBorder implements UIResource { @@ -88,7 +88,7 @@ public class MetalBorders /** * Creates a new instance of ButtonBorder. */ - public MetalButtonBorder() + public ButtonBorder() { } @@ -404,7 +404,7 @@ public class MetalBorders { if (buttonBorder == null) { - Border outer = new MetalButtonBorder(); + Border outer = new ButtonBorder(); Border inner = getMarginBorder(); buttonBorder = new BorderUIResource.CompoundBorderUIResource (outer, inner); @@ -421,7 +421,7 @@ public class MetalBorders { if (toolbarButtonBorder == null) { - Border outer = new MetalButtonBorder(); + Border outer = new ButtonBorder(); Border inner = new RolloverMarginBorder(); toolbarButtonBorder = new BorderUIResource.CompoundBorderUIResource (outer, inner); diff --git a/javax/swing/plaf/metal/MetalCheckBoxIcon.java b/javax/swing/plaf/metal/MetalCheckBoxIcon.java new file mode 100644 index 000000000..eba21a4bf --- /dev/null +++ b/javax/swing/plaf/metal/MetalCheckBoxIcon.java @@ -0,0 +1,136 @@ +/* MetalCheckBoxIcon.java -- An icon for JCheckBoxes in the Metal L&F + Copyright (C) 2005 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package javax.swing.plaf.metal; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; + +import java.io.Serializable; + +import javax.swing.Icon; +import javax.swing.JCheckBox; +import javax.swing.plaf.UIResource; + +/** + * An {@link Icon} implementation for {@link JCheckBox}es in the + * Metal Look & Feel. + * + * @author Roman Kennke (roman@kennke.org) + */ +public class MetalCheckBoxIcon + implements Icon, UIResource, Serializable +{ + + /** Used to paint the border of the icon. */ + MetalBorders.ButtonBorder border; + + /** + * Creates a new MetalCheckBoxIcon instance. + */ + public MetalCheckBoxIcon() + { + border = new MetalBorders.ButtonBorder(); + } + + /** + * Draws the check in the CheckBox. + * + * @param c the component to draw on + * @param g the Graphics context to draw with + * @param x the X position + * @param y the Y position + */ + protected void drawCheck(Component c, Graphics g, int x, int y) + { + g.setColor(Color.BLACK); + g.drawLine(3, 5, 3, 9); + g.drawLine(4, 5, 4, 9); + g.drawLine(5, 7, 9, 3); + g.drawLine(5, 8, 9, 4); + } + + /** + * Returns the size (both X and Y) of the checkbox icon. + * + * @return the size of the checkbox icon + */ + protected int getControlSize() + { + return 13; + } + + /** + * Returns the width of the icon in pixels. + * + * @return the width of the icon in pixels + */ + public int getIconWidth() + { + return getControlSize(); + } + + /** + * Returns the height of the icon in pixels. + * + * @return the height of the icon in pixels + */ + public int getIconHeight() + { + return getControlSize(); + } + + /** + * Paints the icon. This first paints the border of the CheckBox and + * if the CheckBox is selected it calls {@link #drawCheck} to draw + * the check. + * + * @param c the Component to draw on (gets casted to JCheckBox) + * @param g the Graphics context to draw with + * @param x the X position + * @param x the Y position + */ + public void paintIcon(Component c, Graphics g, int x, int y) + { + border.paintBorder(c, g, x, y, getIconWidth(), getIconHeight()); + JCheckBox cb = (JCheckBox) c; + if (cb.isSelected()) + drawCheck(c, g, x, y); + } +} |