[cp-patches] FYI: fix Swing desktop background color

[David Gilbert]

I committed this small patch to set the correct background color for the Swing 
desktop (when using JInternalFrames):

2005-08-24  David Gilbert  <address@hidden>

        * javax/swing/plaf/basic/BasicDesktopPaneUI.java
        (installDefaults): set background color using "desktop" color,
        * javax/swing/plaf/basic/BasicLookAndFeel.java
        (initSystemColorDefaults): removed "Desktop.background" color,
        * javax/swing/plaf/metal/MetalLookAndFeel.java
        (initSystemColorDefaults): added "desktop" color.

Regards,

Dave Gilbert

Index: javax/swing/plaf/basic/BasicDesktopPaneUI.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java,v
retrieving revision 1.4
diff -u -r1.4 BasicDesktopPaneUI.java
--- javax/swing/plaf/basic/BasicDesktopPaneUI.java      2 Jul 2005 20:32:50 
-0000       1.4
+++ javax/swing/plaf/basic/BasicDesktopPaneUI.java      24 Aug 2005 07:53:34 
-0000
@@ -363,7 +363,7 @@
   {
     UIDefaults defaults = UIManager.getLookAndFeelDefaults();
 
-    desktop.setBackground(defaults.getColor("Desktop.background"));
+    desktop.setBackground(defaults.getColor("desktop"));
   }
 
   /**
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.47
diff -u -r1.47 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java        22 Aug 2005 20:45:39 
-0000      1.47
+++ javax/swing/plaf/basic/BasicLookAndFeel.java        24 Aug 2005 07:53:36 
-0000
@@ -402,7 +402,6 @@
         "ctrl F10", "maximize",
         "ctrl alt shift F6","selectPreviousFrame"
       }),
-      "Desktop.background", new ColorUIResource(0, 92, 92),
       "DesktopIcon.border", new BorderUIResource.CompoundBorderUIResource(null,
                                                                           
null),
       "EditorPane.background", new ColorUIResource(Color.white),
Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.39
diff -u -r1.39 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java        9 Aug 2005 18:18:44 
-0000       1.39
+++ javax/swing/plaf/metal/MetalLookAndFeel.java        24 Aug 2005 07:53:38 
-0000
@@ -895,7 +895,8 @@
     super.initSystemColorDefaults(defaults);
     Object[] uiDefaults;
     uiDefaults = new Object[] {
-      "control", new ColorUIResource(getControl())
+      "control", new ColorUIResource(getControl()),
+      "desktop", new ColorUIResource(getDesktopColor())
     };
     defaults.putDefaults(uiDefaults);
   }