8266510: Nimbus JTree default tree cell renderer does not use selected text color
Reviewed-by: psadhukhan, pbansal
This commit is contained in:
Tejpal Rebari
parent
d994b93e21
commit
ecd445562f
@ -43,7 +43,7 @@ import java.awt.image.BufferedImage;
|
||||
* An icon that delegates to a painter.
|
||||
* @author rbair
|
||||
*/
|
||||
class NimbusIcon implements SynthIcon, UIResource {
|
||||
class NimbusIcon implements SynthIcon {
|
||||
private int width;
|
||||
private int height;
|
||||
private String prefix;
|
||||
|
||||
@ -27352,10 +27352,10 @@
|
||||
<contentMargins top="0" bottom="0" left="0" right="0"/>
|
||||
<style>
|
||||
<textForeground>
|
||||
<matte red="0" green="0" blue="0" alpha="0" uiDefaultParentName="text" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
|
||||
<matte red="0" green="0" blue="0" alpha="0" uiDefaultParentName="text" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
|
||||
</textForeground>
|
||||
<textBackground>
|
||||
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
|
||||
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
|
||||
</textBackground>
|
||||
<background>
|
||||
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
|
||||
@ -27379,10 +27379,10 @@
|
||||
<insets top="2" left="0" bottom="1" right="5"/>
|
||||
</uiProperty>
|
||||
<uiProperty name="selectionForeground" type="COLOR">
|
||||
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusSelectedText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
|
||||
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusSelectedText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
|
||||
</uiProperty>
|
||||
<uiProperty name="selectionBackground" type="COLOR">
|
||||
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
|
||||
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
|
||||
</uiProperty>
|
||||
<uiProperty name="dropLineColor" type="COLOR">
|
||||
<matte red="242" green="242" blue="242" alpha="255" uiDefaultParentName="nimbusFocus" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0" alphaOffset="0"/>
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2020, 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.
|
||||
*/
|
||||
|
||||
import javax.swing.UIManager;
|
||||
import javax.swing.UnsupportedLookAndFeelException;
|
||||
import javax.swing.plaf.UIResource;
|
||||
import javax.swing.plaf.nimbus.NimbusLookAndFeel;
|
||||
import java.awt.Color;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8249674
|
||||
* @summary Nimbus JTree renderer properties persist across L&F changes
|
||||
* @key headful
|
||||
* @run main NimbusPropertiesDoNotImplUIResource
|
||||
*/
|
||||
|
||||
public class NimbusPropertiesDoNotImplUIResource {
|
||||
private static final String[] defPropertyKeys = new String[] {
|
||||
"Tree.leafIcon", "Tree.closedIcon",
|
||||
"Tree.openIcon", "Tree.selectionForeground",
|
||||
"Tree.textForeground", "Tree.selectionBackground",
|
||||
"Tree.textBackground", "Tree.selectionBorderColor"};
|
||||
private static String failedKeys = null;
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
UIManager.LookAndFeelInfo[] installedLookAndFeels;
|
||||
installedLookAndFeels = UIManager.getInstalledLookAndFeels();
|
||||
|
||||
for (UIManager.LookAndFeelInfo LF : installedLookAndFeels) {
|
||||
try {
|
||||
UIManager.setLookAndFeel(LF.getClassName());
|
||||
failedKeys = null;
|
||||
for (String propertyKey : defPropertyKeys) {
|
||||
verifyProperty(propertyKey);
|
||||
}
|
||||
if(failedKeys != null) {
|
||||
throw new RuntimeException("JTree renderer Properties " +
|
||||
failedKeys + " are not instance of UIResource for "
|
||||
+ LF.getClassName());
|
||||
}
|
||||
} catch(UnsupportedLookAndFeelException e) {
|
||||
System.out.println("Note: LookAndFeel " + LF.getClassName()
|
||||
+ " is not supported on this configuration");
|
||||
}
|
||||
}
|
||||
|
||||
//Check that the both uiResource option true and false are working for
|
||||
//getDerivedColor method of NimbusLookAndFeel
|
||||
UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
|
||||
Color color1 = ((NimbusLookAndFeel)UIManager.getLookAndFeel())
|
||||
.getDerivedColor("text", 0, 0, 0, 0, false);
|
||||
if(color1 instanceof UIResource) {
|
||||
throw new RuntimeException("color1 should not be instance of " +
|
||||
"UIResource");
|
||||
}
|
||||
|
||||
Color color2 = ((NimbusLookAndFeel)UIManager.getLookAndFeel())
|
||||
.getDerivedColor("text", 0, 0, 0, 0, true);
|
||||
if(!(color2 instanceof UIResource)) {
|
||||
throw new RuntimeException("color2 should be instance of " +
|
||||
"UIResource");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static void verifyProperty(String propertyKey) {
|
||||
Object property = UIManager.get(propertyKey);
|
||||
if (property == null) {
|
||||
return;
|
||||
}
|
||||
if (!(property instanceof UIResource)) {
|
||||
if(failedKeys == null) {
|
||||
failedKeys = ":" + propertyKey;
|
||||
} else {
|
||||
failedKeys += "," + propertyKey;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user