8266510: Nimbus JTree default tree cell renderer does not use selecte…

…d text color Reviewed-by: psadhukhan, pbansal
openjdk · Jul 28, 2021 · ecd4455 · ecd4455 · openjdk-notifier · Jul 28, 2021
1 parent d994b93
commit ecd4455
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 105 deletions.
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
@@ -43,7 +43,7 @@
  * 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;

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
@@ -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"/>

diff --git a/test/jdk/javax/swing/plaf/nimbus/NimbusPropertiesDoNotImplUIResource.java b/test/jdk/javax/swing/plaf/nimbus/NimbusPropertiesDoNotImplUIResource.java