[cp-patches] FYI: MetalButtonUI and some stuff

[Roman Kennke]

Hi,

I commit my work on MetalButtonUI stuff. The JButtons should now look 
nearly exactly like the real Metal Buttons.

The components background color is now initialized with the standard 
component color of the current theme.

2005-04-15  Roman Kennke  <address@hidden>

       * javax/swing/plaf/metal/MetalBorders.java:
       Added.
       * javax/swing/plaf/metal/MetalButtonUI.java:
       (installDefaults): Install button font.
       * javax/swing/plaf/metal/MetalLookAndFeel.java:
       (initComponentDefaults): Added button border, font and margin.
       Changed components background color to the Metal current themes
       standard color.

/Roman

Index: javax/swing/plaf/metal/MetalBorders.java
===================================================================
RCS file: javax/swing/plaf/metal/MetalBorders.java
diff -N javax/swing/plaf/metal/MetalBorders.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ javax/swing/plaf/metal/MetalBorders.java    15 Apr 2005 12:01:01 -0000      
1.1
@@ -0,0 +1,205 @@
+/* MetalBorders.java
+   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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.awt.Insets;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.JButton;
+import javax.swing.border.AbstractBorder;
+import javax.swing.border.Border;
+import javax.swing.plaf.BorderUIResource;
+import javax.swing.plaf.basic.BasicGraphicsUtils;
+import javax.swing.plaf.basic.BasicBorders;
+
+/**
+ * This factory class creates borders for the different Swing components
+ * UI.
+ *
+ * @author Roman Kennke (address@hidden)
+ */
+public class MetalBorders
+{
+
+  /**
+   * A MarginBorder that gets shared by multiple components.
+   * Created on demand by the private helper function address@hidden
+   * #getMarginBorder()}.
+   */
+  private static BasicBorders.MarginBorder sharedMarginBorder;
+
+  /**
+   * The border that is drawn around Swing buttons.
+   */
+  public static class MetalButtonBorder
+    extends AbstractBorder
+  {
+    /** The borders insets. */
+    protected static Insets borderInsets = new Insets(2, 2, 2, 2);
+
+    /**
+     * Creates a new instance of ButtonBorder.
+     */
+    public MetalButtonBorder()
+    {
+    }
+
+    /**
+     * Paints the button border.
+     *
+     * @param c the component for which we paint the border
+     * @param g the Graphics context to use
+     * @param x the X coordinate of the upper left corner of c
+     * @param y the Y coordinate of the upper left corner of c
+     * @param w the width of c
+     * @param h the height of c
+     */
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
+                            int h)
+    {
+      ButtonModel bmodel = null;
+      
+      if (c instanceof AbstractButton)
+        bmodel = ((AbstractButton) c).getModel();
+
+      Color darkShadow = MetalLookAndFeel.getControlDarkShadow();
+      Color shadow = MetalLookAndFeel.getControlShadow();
+      Color light = MetalLookAndFeel.getWhite();
+      Color middle = MetalLookAndFeel.getControl();
+
+      // draw dark border
+      g.setColor(darkShadow);
+      g.drawRect(x, y, w - 2, h - 2);
+
+      if (!bmodel.isPressed())
+        {
+          // draw light border
+          g.setColor(light);
+          g.drawRect(x + 1, y + 1, w - 2, h - 2);
+
+          // draw crossing pixels of both borders
+          g.setColor(middle);
+          g.drawRect(x + 1, y + h - 2, 0, 0);
+          g.drawRect(x + w - 2, y + 1, 0, 0);
+        }
+      else
+        {
+          // draw light border
+          g.setColor(light);
+          g.drawLine(x + w - 1, y + 1, x + w - 1, y + h - 1);
+          g.drawLine(x + 1, y + h - 1, x + w - 1, y + h - 1);
+
+          // draw shadow border
+          g.setColor(middle);
+          g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
+          g.drawLine(x + 1, y + 1, x + 1, y + h - 2);
+
+          // draw crossing pixels of both borders
+          g.setColor(shadow);
+          g.drawRect(x + 1, y + h - 2, 0, 0);
+          g.drawRect(x + w - 2, y + 1, 0, 0);
+        }
+    }
+
+    /**
+     * Returns the insets of the ButtonBorder.
+     *
+     * @param c the component for which the border is used
+     *
+     * @return the insets of the ButtonBorder
+     */
+    public Insets getBorderInsets(Component c)
+    {
+      return getBorderInsets(c, null);
+    }
+
+    /**
+     * Returns the insets of the ButtonBorder in the specified Insets object.
+     *
+     * @param c the component for which the border is used
+     * @param newInsets the insets object where to put the values
+     *
+     * @return the insets of the ButtonBorder
+     */
+    public Insets getBorderInsets(Component c, Insets newInsets)
+    {
+      if (newInsets == null)
+        newInsets = new Insets(0, 0, 0, 0);
+
+      newInsets.bottom = borderInsets.bottom;
+      newInsets.left = borderInsets.left;
+      newInsets.right = borderInsets.right;
+      newInsets.top = borderInsets.top;
+      return newInsets;
+    }
+  }
+
+
+  /**
+   * Returns a border for Swing buttons in the Metal Look &amp; Feel.
+   *
+   * @return a border for Swing buttons in the Metal Look &amp; Feel
+   */
+  public static Border getButtonBorder()
+  {
+    Border outer = new MetalButtonBorder();
+    Border inner = getMarginBorder();
+
+    return new BorderUIResource.CompoundBorderUIResource(outer, inner);
+  }
+
+  /**
+   * Returns a shared MarginBorder.
+   */
+  static Border getMarginBorder()  // intentionally not public
+  {
+    /* Swing is not designed to be thread-safe, so there is no
+     * need to synchronize the access to the global variable.
+     */
+    if (sharedMarginBorder == null)
+      sharedMarginBorder = new BasicBorders.MarginBorder();
+
+    return sharedMarginBorder;
+  }
+
+}

Index: javax/swing/plaf/metal/MetalButtonUI.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalButtonUI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- javax/swing/plaf/metal/MetalButtonUI.java   14 Apr 2005 13:58:51 -0000      
1.2
+++ javax/swing/plaf/metal/MetalButtonUI.java   15 Apr 2005 12:01:01 -0000      
1.3
@@ -40,6 +40,8 @@
 
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicButtonUI;
 
@@ -87,6 +89,9 @@
   public void installDefaults(AbstractButton button)
   {
     super.installDefaults(button);
+
+    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+    button.setFont(defaults.getFont("Button.font"));
   }
 
 }

Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- javax/swing/plaf/metal/MetalLookAndFeel.java        15 Apr 2005 08:59:05 
-0000      1.12
+++ javax/swing/plaf/metal/MetalLookAndFeel.java        15 Apr 2005 12:01:01 
-0000      1.13
@@ -39,6 +39,8 @@
 package javax.swing.plaf.metal;
 
 import java.awt.Color;
+import java.awt.Insets;
+
 import javax.swing.UIDefaults;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
@@ -412,6 +414,13 @@
    * </tr><tr>
    * <td>Button.background</td><td>0xcccccc</td>
    * </tr><tr>
+   * <td>Button.border</td><td>address@hidden MetalBorders.ButtonBorder}</td>
+   * </tr><tr>
+   * <td>Button.font</td><td>address@hidden #getControlTextFont}</td>
+   * </tr><tr>
+   * <td>Button.margin</td><td><code>new java.awt.Insets(2, 14, 2, 14)</code>
+   * </td>
+   * </tr><tr>
    * <td>CheckBox.background</td><td>0xcccccc</td>
    * </tr><tr>
    * <td>CheckBoxMenuItem.background</td><td>0xcccccc</td>
@@ -445,22 +454,24 @@
   protected void initComponentDefaults(UIDefaults defaults)
   {
     super.initComponentDefaults(defaults);
-    Color background = new Color(0xcc, 0xcc, 0xcc);
     Object[] myDefaults = new Object[] {
-      "Button.background", new ColorUIResource(background),
-      "CheckBox.background", new ColorUIResource(background),
-      "CheckBoxMenuItem.background", new ColorUIResource(background),
-      "ToolBar.background", new ColorUIResource(background),
-      "Panel.background", new ColorUIResource(background),
-      "Slider.background", new ColorUIResource(background),
-      "OptionPane.background", new ColorUIResource(background),
-      "ProgressBar.background", new ColorUIResource(background),
-      "TabbedPane.background", new ColorUIResource(background),
-      "Label.background", new ColorUIResource(background),
-      "Menu.background", new ColorUIResource(background),
-      "MenuBar.background", new ColorUIResource(background),
-      "MenuItem.background", new ColorUIResource(background),
-      "ScrollBar.background", new ColorUIResource(background)
+      "Button.background", new ColorUIResource(getControl()),
+      "Button.border", MetalBorders.getButtonBorder(),
+      "Button.font", getControlTextFont(),
+      "Button.margin", new Insets(2, 14, 2, 14),
+      "CheckBox.background", new ColorUIResource(getControl()),
+      "CheckBoxMenuItem.background", new ColorUIResource(getControl()),
+      "ToolBar.background", new ColorUIResource(getControl()),
+      "Panel.background", new ColorUIResource(getControl()),
+      "Slider.background", new ColorUIResource(getControl()),
+      "OptionPane.background", new ColorUIResource(getControl()),
+      "ProgressBar.background", new ColorUIResource(getControl()),
+      "TabbedPane.background", new ColorUIResource(getControl()),
+      "Label.background", new ColorUIResource(getControl()),
+      "Menu.background", new ColorUIResource(getControl()),
+      "MenuBar.background", new ColorUIResource(getControl()),
+      "MenuItem.background", new ColorUIResource(getControl()),
+      "ScrollBar.background", new ColorUIResource(getControl())
     };
     defaults.putDefaults(myDefaults);
   }