7012008: JDesktopPane - Wrong background color with Win7+WindowsLnf
authorpkbalakr
Fri, 11 Mar 2016 11:02:54 +0530
changeset 36870 d6652957df27
parent 36869 f8ef78f4157d
child 36871 62d3bb5aba7a
7012008: JDesktopPane - Wrong background color with Win7+WindowsLnf Reviewed-by: ssadetsky, aivanov
jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
jdk/test/javax/swing/JDesktopPane/DesktopPaneBackgroundTest.java
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java	Fri Mar 11 11:00:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java	Fri Mar 11 11:02:54 2016 +0530
@@ -698,7 +698,7 @@
 
             // DeskTop.
             "Desktop.background", new DesktopProperty(
-                                                 "win.desktop.backgroundColor",
+                                                 "win.mdi.backgroundColor",
                                                   table.get("desktop")),
             "Desktop.ancestorInputMap",
                new UIDefaults.LazyInputMap(new Object[] {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JDesktopPane/DesktopPaneBackgroundTest.java	Fri Mar 11 11:02:54 2016 +0530
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2016, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+ */
+
+ /*
+* @test
+* @bug 7012008
+* @summary Verify JDesktopPane Background Color for WLAF
+* @requires (os.family == "windows")
+* @run main DesktopPaneBackgroundTest
+ */
+import java.awt.Color;
+import java.awt.Toolkit;
+import javax.swing.JDesktopPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class DesktopPaneBackgroundTest {
+
+    private static Color defaultBackgroudColor;
+
+    public static void main(String[] args) throws Exception {
+        defaultBackgroudColor = (Color) Toolkit.getDefaultToolkit()
+                .getDesktopProperty("win.mdi.backgroundColor");
+
+        String[] lookAndFeel = new String[]{
+            "com.sun.java.swing.plaf.windows.WindowsLookAndFeel",
+            "com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel"};
+
+        for (String laf : lookAndFeel) {
+            UIManager.setLookAndFeel(laf);
+
+            SwingUtilities.invokeAndWait(() -> {
+                JDesktopPane desktopPane = new JDesktopPane();
+
+                Color background = desktopPane.getBackground();
+                if (!background.equals(defaultBackgroudColor)) {
+                    throw new RuntimeException("Invalid JDesktopPane "
+                            + "Background Color for WLAF");
+                }
+            });
+        }
+    }
+}