First pass for tonal text components

kirill-grouchnikov · kirill-grouchnikov · commit c9d193441e1b · 2025-01-22T00:30:54.000-05:00
For #400
diff --git a/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceEditorPaneUI.java b/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceEditorPaneUI.java
@@ -30,9 +30,8 @@
 package org.pushingpixels.radiance.theming.internal.ui;
 
 import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingCortex.ComponentOrParentChainScope;
-import org.pushingpixels.radiance.theming.api.RadianceThemingWidget;
+import org.pushingpixels.radiance.theming.api.*;
+import org.pushingpixels.radiance.theming.api.palette.TonalSkin;
 import org.pushingpixels.radiance.theming.internal.RadianceThemingWidgetRepository;
 import org.pushingpixels.radiance.theming.internal.animation.StateTransitionTracker;
 import org.pushingpixels.radiance.theming.internal.animation.TransitionAwareUI;
@@ -190,10 +189,15 @@ protected void installDefaults() {
             }
             Color foregr = editorPane.getForeground();
             if ((foregr == null) || (foregr instanceof UIResource)) {
-                editorPane.setForeground(RadianceColorUtilities.getForegroundColor(
-                        RadianceThemingCortex.ComponentScope.getCurrentSkin(editorPane)
-                                .getEnabledColorScheme(ComponentOrParentChainScope
-                                        .getDecorationType(editorPane))));
+                RadianceSkin skin = RadianceCoreUtilities.getSkin(editorPane);
+                if (skin instanceof TonalSkin) {
+                    editorPane.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getContainerTokens(editorPane, ComponentState.ENABLED,
+                            RadianceThemingSlices.ContainerType.MUTED)));
+                } else {
+                    editorPane.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope.getDecorationType(editorPane))));
+                }
             }
         });
         for (RadianceThemingWidget themingWidget : this.themingWidgets) {
diff --git a/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceFormattedTextFieldUI.java b/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceFormattedTextFieldUI.java
@@ -30,9 +30,8 @@
 package org.pushingpixels.radiance.theming.internal.ui;
 
 import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingCortex.ComponentOrParentChainScope;
-import org.pushingpixels.radiance.theming.api.RadianceThemingWidget;
+import org.pushingpixels.radiance.theming.api.*;
+import org.pushingpixels.radiance.theming.api.palette.TonalSkin;
 import org.pushingpixels.radiance.theming.internal.RadianceThemingWidgetRepository;
 import org.pushingpixels.radiance.theming.internal.animation.StateTransitionTracker;
 import org.pushingpixels.radiance.theming.internal.animation.TransitionAwareUI;
@@ -202,10 +201,15 @@ protected void installDefaults() {
             }
             Color foregr = textField.getForeground();
             if ((foregr == null) || (foregr instanceof UIResource)) {
-                textField.setForeground(RadianceColorUtilities
-                        .getForegroundColor(RadianceThemingCortex.ComponentScope.getCurrentSkin(textField)
-                                .getEnabledColorScheme(ComponentOrParentChainScope
-                                        .getDecorationType(textField))));
+                RadianceSkin skin = RadianceCoreUtilities.getSkin(textField);
+                if (skin instanceof TonalSkin) {
+                    textField.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getContainerTokens(textField, ComponentState.ENABLED,
+                            RadianceThemingSlices.ContainerType.MUTED)));
+                } else {
+                    textField.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope.getDecorationType(textField))));
+                }
             }
         });
         for (RadianceThemingWidget themingWidget : this.themingWidgets) {
diff --git a/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceTextAreaUI.java b/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceTextAreaUI.java
@@ -30,8 +30,8 @@
 package org.pushingpixels.radiance.theming.internal.ui;
 
 import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingWidget;
+import org.pushingpixels.radiance.theming.api.*;
+import org.pushingpixels.radiance.theming.api.palette.TonalSkin;
 import org.pushingpixels.radiance.theming.internal.RadianceThemingWidgetRepository;
 import org.pushingpixels.radiance.theming.internal.animation.StateTransitionTracker;
 import org.pushingpixels.radiance.theming.internal.animation.TransitionAwareUI;
@@ -191,10 +191,15 @@ protected void installDefaults() {
                 return;
             Color foregr = textArea.getForeground();
             if ((foregr == null) || (foregr instanceof UIResource)) {
-                textArea.setForeground(RadianceColorUtilities
-                        .getForegroundColor(RadianceThemingCortex.ComponentScope.getCurrentSkin(textArea)
-                                .getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope
-                                        .getDecorationType(textArea))));
+                RadianceSkin skin = RadianceCoreUtilities.getSkin(textArea);
+                if (skin instanceof TonalSkin) {
+                    textArea.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getContainerTokens(textArea, ComponentState.ENABLED,
+                            RadianceThemingSlices.ContainerType.MUTED)));
+                } else {
+                    textArea.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope.getDecorationType(textArea))));
+                }
             }
         });
         for (RadianceThemingWidget themingWidget : this.themingWidgets) {
diff --git a/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceTextFieldUI.java b/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceTextFieldUI.java
@@ -30,8 +30,8 @@
 package org.pushingpixels.radiance.theming.internal.ui;
 
 import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingWidget;
+import org.pushingpixels.radiance.theming.api.*;
+import org.pushingpixels.radiance.theming.api.palette.TonalSkin;
 import org.pushingpixels.radiance.theming.internal.RadianceThemingWidgetRepository;
 import org.pushingpixels.radiance.theming.internal.animation.StateTransitionTracker;
 import org.pushingpixels.radiance.theming.internal.animation.TransitionAwareUI;
@@ -204,10 +204,15 @@ protected void installDefaults() {
                 return;
             Color foregr = textField.getForeground();
             if ((foregr == null) || (foregr instanceof UIResource)) {
-                textField.setForeground(RadianceColorUtilities
-                        .getForegroundColor(RadianceThemingCortex.ComponentScope.getCurrentSkin(textField)
-                                .getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope
-                                        .getDecorationType(textField))));
+                RadianceSkin skin = RadianceCoreUtilities.getSkin(textField);
+                if (skin instanceof TonalSkin) {
+                    textField.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getContainerTokens(textField, ComponentState.ENABLED,
+                            RadianceThemingSlices.ContainerType.MUTED)));
+                } else {
+                    textField.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope.getDecorationType(textField))));
+                }
             }
         });
         for (RadianceThemingWidget themingWidget : this.themingWidgets) {
diff --git a/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceTextPaneUI.java b/theming/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceTextPaneUI.java
@@ -30,8 +30,8 @@
 package org.pushingpixels.radiance.theming.internal.ui;
 
 import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingCortex;
-import org.pushingpixels.radiance.theming.api.RadianceThemingWidget;
+import org.pushingpixels.radiance.theming.api.*;
+import org.pushingpixels.radiance.theming.api.palette.TonalSkin;
 import org.pushingpixels.radiance.theming.internal.RadianceThemingWidgetRepository;
 import org.pushingpixels.radiance.theming.internal.animation.StateTransitionTracker;
 import org.pushingpixels.radiance.theming.internal.animation.TransitionAwareUI;
@@ -184,10 +184,15 @@ protected void installDefaults() {
                 return;
             Color foregr = textPane.getForeground();
             if ((foregr == null) || (foregr instanceof UIResource)) {
-                textPane.setForeground(RadianceColorUtilities
-                        .getForegroundColor(RadianceThemingCortex.ComponentScope.getCurrentSkin(textPane)
-                                .getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope
-                                        .getDecorationType(textPane))));
+                RadianceSkin skin = RadianceCoreUtilities.getSkin(textPane);
+                if (skin instanceof TonalSkin) {
+                    textPane.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getContainerTokens(textPane, ComponentState.ENABLED,
+                            RadianceThemingSlices.ContainerType.MUTED)));
+                } else {
+                    textPane.setForeground(RadianceColorUtilities.getForegroundColor(
+                        skin.getEnabledColorScheme(RadianceThemingCortex.ComponentOrParentChainScope.getDecorationType(textPane))));
+                }
             }
         });
         for (RadianceThemingWidget themingWidget : this.themingWidgets) {
