at master 1.4 kB view raw
1diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java 2--- a/jdk/src/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300 3+++ b/jdk/src/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300 4@@ -607,11 +607,9 @@ 5 if (osType == OSInfo.OSType.WINDOWS) { 6 return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; 7 } else { 8- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); 9 Toolkit toolkit = Toolkit.getDefaultToolkit(); 10- if ("gnome".equals(desktop) && 11- toolkit instanceof SunToolkit && 12- ((SunToolkit) toolkit).isNativeGTKAvailable()) { 13+ if (toolkit instanceof SunToolkit && 14+ ((SunToolkit) toolkit).isNativeGTKAvailable()) { 15 // May be set on Linux and Solaris boxs. 16 return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; 17 } 18@@ -1341,7 +1339,7 @@ 19 lafName = (String) lafData.remove("defaultlaf"); 20 } 21 if (lafName == null) { 22- lafName = getCrossPlatformLookAndFeelClassName(); 23+ lafName = getSystemLookAndFeelClassName(); 24 } 25 lafName = swingProps.getProperty(defaultLAFKey, lafName); 26