Some more tonal API tweaks

For #400
kirill-grouchnikov · Dec 12, 2024 · f0e006c · f0e006c
1 parent 001b33a
commit f0e006c
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/...theming-demo/src/main/java/org/pushingpixels/radiance/demo/theming/main/RadianceLogo.java b/...theming-demo/src/main/java/org/pushingpixels/radiance/demo/theming/main/RadianceLogo.java
@@ -56,7 +56,7 @@ public static RadianceIcon getLogoIcon(RadianceColorScheme scheme) {
     public static RadianceIcon getLogoIcon(ExtendedContainerRenderColorTokens renderColorTokens) {
         // Step 1 - create a colorized version of the transcoded Radiance logo
         RadianceIcon base = radiance_menu.factory().createNewIcon();
-        base.setColorFilter(color -> renderColorTokens.getSurfaceContainerTokens()
+        base.setColorFilter(color -> renderColorTokens.getBaseContainerColorTokens()
             .getOnContainerColorTokens().getOnContainer());
         // Step 2 - configure the colorized version to be 16x16
         base.setDimension(new Dimension(16, 16));

diff --git a/...-demo/src/main/java/org/pushingpixels/radiance/demo/theming/main/check/FakeAccordion.java b/...-demo/src/main/java/org/pushingpixels/radiance/demo/theming/main/check/FakeAccordion.java
@@ -91,7 +91,7 @@ protected void paintComponent(Graphics g) {
                         if (skin instanceof TonalSkin) {
                             ExtendedContainerRenderColorTokens colorTokens = skin.getBackgroundRenderColorTokens(
                                 DecorationPainterUtils.getDecorationType(this));
-                            accentedFill = colorTokens.getSurfaceContainerTokens()
+                            accentedFill = colorTokens.getBaseContainerColorTokens()
                                 .getContainerColorTokens().getContainerLow();
                         } else {
                             RadianceThemingSlices.DecorationAreaType decorationAreaType =

diff --git a/.../java/org/pushingpixels/radiance/theming/api/painter/decoration/ArcDecorationPainter.java b/.../java/org/pushingpixels/radiance/theming/api/painter/decoration/ArcDecorationPainter.java
@@ -150,7 +150,7 @@ private void paintTitleBackground(Graphics2D original, Component comp, int width
     private void paintTitleBackground(Graphics2D original, Component comp, int width, int height,
             ExtendedContainerRenderColorTokens renderColorTokens) {
         ContainerColorTokens containerColorTokens =
-            renderColorTokens.getSurfaceContainerTokens().getContainerColorTokens();
+            renderColorTokens.getBaseContainerColorTokens().getContainerColorTokens();
 
         // Create a new Graphics2D object so that we can apply clipping to it without having
         // to reset the state after we're done
@@ -248,7 +248,7 @@ private void paintExtraBackground(Graphics2D graphics, Container parent, Compone
     private void paintExtraBackground(Graphics2D graphics, Container parent, Component comp,
             int width, int height, ExtendedContainerRenderColorTokens renderColorTokens) {
         ContainerColorTokens containerColorTokens =
-            renderColorTokens.getSurfaceContainerTokens().getContainerColorTokens();
+            renderColorTokens.getBaseContainerColorTokens().getContainerColorTokens();
 
         Point offset = RadianceCoreUtilities.getOffsetInRootPaneCoords(comp);
         JRootPane rootPane = SwingUtilities.getRootPane(parent);
@@ -308,7 +308,7 @@ public void paintDecorationArea(Graphics2D graphics, Component comp,
         ExtendedContainerRenderColorTokens renderColorTokens) {
 
         ContainerColorTokens containerColorTokens =
-            renderColorTokens.getSurfaceContainerTokens().getContainerColorTokens();
+            renderColorTokens.getBaseContainerColorTokens().getContainerColorTokens();
 
         Component parent = RadianceCoreUtilities.getHeaderParent(comp);
         Point offset = RadianceCoreUtilities.getOffsetInRootPaneCoords(comp);

diff --git a/.../pushingpixels/radiance/theming/api/painter/decoration/ImageWrapperDecorationPainter.java b/.../pushingpixels/radiance/theming/api/painter/decoration/ImageWrapperDecorationPainter.java
@@ -121,7 +121,7 @@ private void paintTitleBackground(Graphics2D graphics, Component comp,
             ExtendedContainerRenderColorTokens tileRenderColorTokens =
                     skin.getBackgroundRenderColorTokens(decorationAreaType);
             if (this.baseDecorationPainter == null) {
-                graphics.setColor(tileRenderColorTokens.getSurfaceContainerTokens().
+                graphics.setColor(tileRenderColorTokens.getBaseContainerColorTokens().
                     getContainerColorTokens().getContainerHigh());
                 graphics.fillRect(0, 0, width, height);
             } else {
@@ -174,7 +174,7 @@ private void paintExtraBackground(Graphics2D graphics, Component comp,
             if (this.baseDecorationPainter != null) {
                 this.baseDecorationPainter.paintDecorationArea(graphics, comp, decorationAreaType, width, height, skin);
             } else {
-                graphics.setColor(tileRenderColorTokens.getSurfaceContainerTokens()
+                graphics.setColor(tileRenderColorTokens.getBaseContainerColorTokens()
                     .getContainerColorTokens().getContainerHigh());
                 graphics.fillRect(0, 0, width, height);
             }
@@ -225,7 +225,7 @@ public void paintDecorationArea(Graphics2D graphics, Component comp,
             this.baseDecorationPainter.paintDecorationArea(graphics, comp, decorationAreaType,
                     contour, renderColorTokens);
         } else {
-            graphics.setColor(renderColorTokens.getSurfaceContainerTokens()
+            graphics.setColor(renderColorTokens.getBaseContainerColorTokens()
                 .getContainerColorTokens().getContainerHigh());
             graphics.fill(contour);
         }
@@ -371,7 +371,7 @@ protected BufferedImage getColorizedTile(double scale, ExtendedContainerRenderCo
                     (int) ( tileHeight / scale), null);
             tile2D.dispose();
             result = RadianceImageCreator.getColorSchemeImage(tileBi,
-                renderColorTokens.getSurfaceContainerTokens(), 0.0f, 1.0f);
+                renderColorTokens.getBaseContainerColorTokens(), 0.0f, 1.0f);
             this.colorizedTileMap.put(key, result);
         }
         return result;

diff --git a/...ava/org/pushingpixels/radiance/theming/api/painter/decoration/MatteDecorationPainter.java b/...ava/org/pushingpixels/radiance/theming/api/painter/decoration/MatteDecorationPainter.java
@@ -168,9 +168,9 @@ protected void fill(Graphics2D graphics, ExtendedContainerRenderColorTokens rend
         // 0 - flex : light -> medium
         // flex - : medium fill
 
-        Color startColor = renderColorTokens.getSurfaceContainerTokens()
+        Color startColor = renderColorTokens.getBaseContainerColorTokens()
             .getContainerColorTokens().getContainerLowest();
-        Color endColor = renderColorTokens.getSurfaceContainerTokens()
+        Color endColor = renderColorTokens.getBaseContainerColorTokens()
             .getContainerColorTokens().getContainer();
 
         int gradientHeight = Math.max(FLEX_POINT, height + offsetY);
@@ -217,9 +217,9 @@ public void paintDecorationArea(Graphics2D graphics, Component comp,
 
         Point offset = RadianceCoreUtilities.getOffsetInRootPaneCoords(comp);
 
-        Color startColor = renderColorTokens.getSurfaceContainerTokens()
+        Color startColor = renderColorTokens.getBaseContainerColorTokens()
             .getContainerColorTokens().getContainerHigh();
-        Color endColor = renderColorTokens.getSurfaceContainerTokens()
+        Color endColor = renderColorTokens.getBaseContainerColorTokens()
             .getContainerColorTokens().getContainerHighest();
 
         int gradientHeight = Math.max(FLEX_POINT, comp.getHeight() + offset.y);

diff --git a/...org/pushingpixels/radiance/theming/api/painter/overlay/BottomLineTonalOverlayPainter.java b/...org/pushingpixels/radiance/theming/api/painter/overlay/BottomLineTonalOverlayPainter.java
@@ -82,7 +82,7 @@ public void paintOverlay(Graphics2D g, Component comp,
             ExtendedContainerRenderColorTokens surfaceTokens =
                 skin.getBackgroundRenderColorTokens(decorationAreaType);
             Color lineColor = this.containerTokensQuery.query(
-                surfaceTokens.getSurfaceContainerTokens());
+                surfaceTokens.getBaseContainerColorTokens());
             graphics1X.setColor(RadianceColorUtilities.getAlphaColor(lineColor, 128));
 
             int bottomY = (int) (scaleFactor * topMostWithSameDecorationAreaType.getHeight() - 1);

diff --git a/.../java/org/pushingpixels/radiance/theming/api/painter/overlay/TopShadowOverlayPainter.java b/.../java/org/pushingpixels/radiance/theming/api/painter/overlay/TopShadowOverlayPainter.java
@@ -89,7 +89,7 @@ public void paintOverlay(Graphics2D graphics, Component comp,
 
         Color shadowColor = (skin instanceof TonalSkin)
             ? RadianceColorSchemeUtilities.getExtendedRenderColorTokens(comp, ComponentState.ENABLED,
-                RadianceThemingSlices.ContainerType.NEUTRAL).getSurfaceContainerTokens()
+                RadianceThemingSlices.ContainerType.NEUTRAL).getBaseContainerColorTokens()
                 .getContainerOutlineColorTokens().getContainerOutline()
             :RadianceColorUtilities.deriveByBrightness(
                 RadianceColorUtilities.getBackgroundFillColor(comp), -0.4f);

diff --git a/...va/org/pushingpixels/radiance/theming/api/palette/ExtendedContainerRenderColorTokens.java b/...va/org/pushingpixels/radiance/theming/api/palette/ExtendedContainerRenderColorTokens.java
@@ -35,5 +35,5 @@ public interface ExtendedContainerRenderColorTokens {
     Color getSurface();
     Color getSurfaceDim();
     Color getSurfaceBright();
-    ContainerRenderColorTokens getSurfaceContainerTokens();
+    ContainerRenderColorTokens getBaseContainerColorTokens();
 }
diff --git a/...ng/src/main/java/org/pushingpixels/radiance/theming/api/palette/RadianceColorScheme2.java b/...ng/src/main/java/org/pushingpixels/radiance/theming/api/palette/RadianceColorScheme2.java
@@ -72,7 +72,7 @@ public Color getSurfaceBright() {
             }
 
             @Override
-            public ContainerRenderColorTokens getSurfaceContainerTokens() {
+            public ContainerRenderColorTokens getBaseContainerColorTokens() {
                 return stateRenderTokens;
             }
         };
@@ -144,7 +144,7 @@ public Color getSurfaceBright() {
             }
 
             @Override
-            public ContainerRenderColorTokens getSurfaceContainerTokens() {
+            public ContainerRenderColorTokens getBaseContainerColorTokens() {
                 return containerRenderColorTokens;
             }
         };

diff --git a/.../main/java/org/pushingpixels/radiance/theming/internal/painter/SeparatorPainterUtils.java b/.../main/java/org/pushingpixels/radiance/theming/internal/painter/SeparatorPainterUtils.java
@@ -147,7 +147,7 @@ public static void paintSeparator(Component c, Graphics g, int width, int height
                     // decoration type of that separator
                     renderColorTokens = RadianceCoreUtilities.getSkin(c).getBackgroundRenderColorTokens(
                         RadianceThemingCortex.ComponentOrParentChainScope.getDecorationType(c))
-                        .getSurfaceContainerTokens();
+                        .getBaseContainerColorTokens();
                 }
             }
             if (renderColorTokens == null) {

diff --git a/.../java/org/pushingpixels/radiance/theming/internal/utils/RadianceColorSchemeUtilities.java b/.../java/org/pushingpixels/radiance/theming/internal/utils/RadianceColorSchemeUtilities.java
@@ -193,7 +193,7 @@ public static ContainerRenderColorTokens getRenderColorTokens(Component componen
             // TODO: TONAL - verify that we don't need to use the old logic.
             // TODO: TONAL - colorization
             return skin.getBackgroundRenderColorTokens(DecorationPainterUtils.getDecorationType(component))
-                .getSurfaceContainerTokens();
+                .getBaseContainerColorTokens();
 //            component = component.getParent();
         }
 
@@ -290,7 +290,7 @@ public static ContainerRenderColorTokens getRenderColorTokens(Component componen
             && RadianceCoreUtilities.hasFlatAppearance(component, false)) {
             // TODO: TONAL - verify that we don't need to use the old logic.
             return skin.getBackgroundRenderColorTokens(DecorationPainterUtils.getDecorationType(component))
-                    .getSurfaceContainerTokens();
+                    .getBaseContainerColorTokens();
 //            component = component.getParent();
         }
 

diff --git a/...c/main/java/org/pushingpixels/radiance/theming/internal/utils/RadianceColorUtilities.java b/...c/main/java/org/pushingpixels/radiance/theming/internal/utils/RadianceColorUtilities.java
@@ -913,7 +913,7 @@ public static Color getStripedBackground(JComponent component, int rowIndex) {
             ExtendedContainerRenderColorTokens colorTokens = skin.getBackgroundRenderColorTokens(
                 DecorationPainterUtils.getDecorationType(component));
             return (rowIndex % 2 == 0) ? colorTokens.getSurface()
-                : colorTokens.getSurfaceContainerTokens().getContainerColorTokens().getContainerLow();
+                : colorTokens.getBaseContainerColorTokens().getContainerColorTokens().getContainerLow();
         } else {
             RadianceColorScheme scheme = skin.getBackgroundColorScheme(
                 DecorationPainterUtils.getDecorationType(component));

diff --git a/...ava/org/pushingpixels/radiance/theming/internal/utils/RadianceInternalFrameTitlePane.java b/...ava/org/pushingpixels/radiance/theming/internal/utils/RadianceInternalFrameTitlePane.java
@@ -294,7 +294,7 @@ public void paintComponent(Graphics g) {
             if (skin instanceof TonalSkin) {
                 ContainerRenderColorTokens renderColorTokens = skin.getBackgroundRenderColorTokens(
                     RadianceThemingSlices.DecorationAreaType.PRIMARY_TITLE_PANE)
-                    .getSurfaceContainerTokens();
+                    .getBaseContainerColorTokens();
                 // TODO: TONAL - support colorization of text
                 // TODO: TONAL - finalize the text echo color logic
                 RadianceTextUtilities.paintTextWithDropShadow(this, graphics,

diff --git a/...ng/src/main/java/org/pushingpixels/radiance/theming/internal/utils/RadianceTitlePane.java b/...ng/src/main/java/org/pushingpixels/radiance/theming/internal/utils/RadianceTitlePane.java
@@ -177,7 +177,7 @@ public RadianceTitlePane(JRootPane root, RadianceRootPaneUI ui) {
         if (skin instanceof TonalSkin) {
             this.setForeground(skin.getBackgroundRenderColorTokens(
                 RadianceThemingSlices.DecorationAreaType.PRIMARY_TITLE_PANE)
-                    .getSurfaceContainerTokens().getOnContainerColorTokens()
+                    .getBaseContainerColorTokens().getOnContainerColorTokens()
                     .getOnContainer());
         } else {
             this.setForeground(RadianceColorUtilities.getForegroundColor(
@@ -892,7 +892,7 @@ public void paintComponent(Graphics g) {
 
             if (skin instanceof TonalSkin) {
                 ContainerRenderColorTokens renderColorTokens = skin.getBackgroundRenderColorTokens(
-                        RadianceThemingSlices.DecorationAreaType.PRIMARY_TITLE_PANE).getSurfaceContainerTokens();
+                        RadianceThemingSlices.DecorationAreaType.PRIMARY_TITLE_PANE).getBaseContainerColorTokens();
                 // TODO: TONAL - finalize the text echo color logic
                 RadianceTextUtilities.paintTextWithDropShadow(this, graphics,
                         renderColorTokens.getOnContainerColorTokens().getOnContainer(),

diff --git a/...ain/java/org/pushingpixels/radiance/theming/internal/utils/border/RadiancePaneBorder.java b/...ain/java/org/pushingpixels/radiance/theming/internal/utils/border/RadiancePaneBorder.java
@@ -75,7 +75,7 @@ public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
                 SwingUtilities.windowForComponent(c));
             ContainerRenderColorTokens titleRenderColorTokens =
                 skin.getBackgroundRenderColorTokens(DecorationPainterUtils.getDecorationType(titlePaneComp))
-                    .getSurfaceContainerTokens();
+                    .getBaseContainerColorTokens();
 
             Graphics2D graphics = (Graphics2D) g.create();