Migrate older fill painters to be fraction-based

And clean up the internal color query utilities that added more complexity than necessary. For #462
kirill-grouchnikov · Mar 4, 2024 · b223182 · b223182
1 parent 4168c2b
commit b223182
Show file tree

Hide file tree

Showing 65 changed files with 80 additions and 311 deletions.
diff --git a/docs/images/theming/skins/autumn1.png b/docs/images/theming/skins/autumn1.png
diff --git a/docs/images/theming/skins/autumn2.png b/docs/images/theming/skins/autumn2.png
diff --git a/docs/images/theming/skins/business1.png b/docs/images/theming/skins/business1.png
diff --git a/docs/images/theming/skins/business2.png b/docs/images/theming/skins/business2.png
diff --git a/docs/images/theming/skins/businessblacksteel1.png b/docs/images/theming/skins/businessblacksteel1.png
diff --git a/docs/images/theming/skins/businessblacksteel2.png b/docs/images/theming/skins/businessblacksteel2.png
diff --git a/docs/images/theming/skins/businessbluesteel1.png b/docs/images/theming/skins/businessbluesteel1.png
diff --git a/docs/images/theming/skins/businessbluesteel2.png b/docs/images/theming/skins/businessbluesteel2.png
diff --git a/docs/images/theming/skins/cerulean1.png b/docs/images/theming/skins/cerulean1.png
diff --git a/docs/images/theming/skins/cerulean2.png b/docs/images/theming/skins/cerulean2.png
diff --git a/docs/images/theming/skins/creme1.png b/docs/images/theming/skins/creme1.png
diff --git a/docs/images/theming/skins/creme2.png b/docs/images/theming/skins/creme2.png
diff --git a/docs/images/theming/skins/cremecoffee1.png b/docs/images/theming/skins/cremecoffee1.png
diff --git a/docs/images/theming/skins/cremecoffee2.png b/docs/images/theming/skins/cremecoffee2.png
diff --git a/docs/images/theming/skins/dust1.png b/docs/images/theming/skins/dust1.png
diff --git a/docs/images/theming/skins/dust2.png b/docs/images/theming/skins/dust2.png
diff --git a/docs/images/theming/skins/dustcoffee1.png b/docs/images/theming/skins/dustcoffee1.png
diff --git a/docs/images/theming/skins/dustcoffee2.png b/docs/images/theming/skins/dustcoffee2.png
diff --git a/docs/images/theming/skins/gemini1.png b/docs/images/theming/skins/gemini1.png
diff --git a/docs/images/theming/skins/gemini2.png b/docs/images/theming/skins/gemini2.png
diff --git a/docs/images/theming/skins/graphite1.png b/docs/images/theming/skins/graphite1.png
diff --git a/docs/images/theming/skins/graphite2.png b/docs/images/theming/skins/graphite2.png
diff --git a/docs/images/theming/skins/graphiteaqua1.png b/docs/images/theming/skins/graphiteaqua1.png
diff --git a/docs/images/theming/skins/graphiteaqua2.png b/docs/images/theming/skins/graphiteaqua2.png
diff --git a/docs/images/theming/skins/graphitechalk1.png b/docs/images/theming/skins/graphitechalk1.png
diff --git a/docs/images/theming/skins/graphitechalk2.png b/docs/images/theming/skins/graphitechalk2.png
diff --git a/docs/images/theming/skins/graphiteelectric1.png b/docs/images/theming/skins/graphiteelectric1.png
diff --git a/docs/images/theming/skins/graphiteglass1.png b/docs/images/theming/skins/graphiteglass1.png
diff --git a/docs/images/theming/skins/graphiteglass2.png b/docs/images/theming/skins/graphiteglass2.png
diff --git a/docs/images/theming/skins/graphitegold1.png b/docs/images/theming/skins/graphitegold1.png
diff --git a/docs/images/theming/skins/graphitegold2.png b/docs/images/theming/skins/graphitegold2.png
diff --git a/docs/images/theming/skins/graphitesienna1.png b/docs/images/theming/skins/graphitesienna1.png
diff --git a/docs/images/theming/skins/graphitesunset1.png b/docs/images/theming/skins/graphitesunset1.png
diff --git a/docs/images/theming/skins/graphitesunset2.png b/docs/images/theming/skins/graphitesunset2.png
diff --git a/docs/images/theming/skins/greenmagic1.png b/docs/images/theming/skins/greenmagic1.png
diff --git a/docs/images/theming/skins/greenmagic2.png b/docs/images/theming/skins/greenmagic2.png
diff --git a/docs/images/theming/skins/magellan1.png b/docs/images/theming/skins/magellan1.png
diff --git a/docs/images/theming/skins/magellan2.png b/docs/images/theming/skins/magellan2.png
diff --git a/docs/images/theming/skins/mariner1.png b/docs/images/theming/skins/mariner1.png
diff --git a/docs/images/theming/skins/mariner2.png b/docs/images/theming/skins/mariner2.png
diff --git a/docs/images/theming/skins/mistaqua1.png b/docs/images/theming/skins/mistaqua1.png
diff --git a/docs/images/theming/skins/mistaqua2.png b/docs/images/theming/skins/mistaqua2.png
diff --git a/docs/images/theming/skins/mistsilver1.png b/docs/images/theming/skins/mistsilver1.png
diff --git a/docs/images/theming/skins/mistsilver2.png b/docs/images/theming/skins/mistsilver2.png
diff --git a/docs/images/theming/skins/moderate1.png b/docs/images/theming/skins/moderate1.png
diff --git a/docs/images/theming/skins/moderate2.png b/docs/images/theming/skins/moderate2.png
diff --git a/docs/images/theming/skins/nebula1.png b/docs/images/theming/skins/nebula1.png
diff --git a/docs/images/theming/skins/nebula2.png b/docs/images/theming/skins/nebula2.png
diff --git a/docs/images/theming/skins/nebulaamethyst1.png b/docs/images/theming/skins/nebulaamethyst1.png
diff --git a/docs/images/theming/skins/nebulaamethyst2.png b/docs/images/theming/skins/nebulaamethyst2.png
diff --git a/docs/images/theming/skins/nebulabrickwall1.png b/docs/images/theming/skins/nebulabrickwall1.png
diff --git a/docs/images/theming/skins/nebulabrickwall2.png b/docs/images/theming/skins/nebulabrickwall2.png
diff --git a/docs/images/theming/skins/raven1.png b/docs/images/theming/skins/raven1.png
diff --git a/docs/images/theming/skins/raven2.png b/docs/images/theming/skins/raven2.png
diff --git a/docs/images/theming/skins/sahara1.png b/docs/images/theming/skins/sahara1.png
diff --git a/docs/images/theming/skins/sahara2.png b/docs/images/theming/skins/sahara2.png
diff --git a/...src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/ClassicFillPainter.java b/...src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/ClassicFillPainter.java
@@ -29,18 +29,16 @@
  */
 package org.pushingpixels.radiance.theming.api.painter.fill;
 
-import org.pushingpixels.radiance.theming.api.colorscheme.RadianceColorScheme;
+import org.pushingpixels.radiance.theming.api.colorscheme.ColorSchemeSingleColorQuery;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceColorUtilities;
 
-import java.awt.*;
-
 /**
  * Fill painter that draws visuals with classic appearance. This class is part
  * of officially supported API.
  * 
  * @author Kirill Grouchnikov
  */
-public class ClassicFillPainter extends StandardFillPainter {
+public class ClassicFillPainter extends FractionBasedFillPainter {
 	/**
 	 * Reusable instance of this painter.
 	 */
@@ -50,22 +48,15 @@ public class ClassicFillPainter extends StandardFillPainter {
 	 * Creates a new classic gradient painter.
 	 */
 	public ClassicFillPainter() {
-	}
-
-	@Override
-	public String getDisplayName() {
-		return "Classic";
-	}
-
-	@Override
-	public Color getTopFillColor(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(super.getBottomFillColor(fillScheme),
-				super.getMidFillColorTop(fillScheme), 0.5f);
-	}
-
-	@Override
-	public Color getMidFillColorTop(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(super.getMidFillColorTop(fillScheme),
-				super.getBottomFillColor(fillScheme), 0.7f);
+		super("Classic",
+				new float[] {0.0f, 0.5f, 1.0f},
+				new ColorSchemeSingleColorQuery[] {
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.5f),
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.7f),
+						ColorSchemeSingleColorQuery.ULTRALIGHT
+				}
+		);
 	}
 }
diff --git a/...g/src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/GlassFillPainter.java b/...g/src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/GlassFillPainter.java
@@ -29,43 +29,29 @@
  */
 package org.pushingpixels.radiance.theming.api.painter.fill;
 
-import org.pushingpixels.radiance.theming.api.colorscheme.RadianceColorScheme;
+import org.pushingpixels.radiance.theming.api.colorscheme.ColorSchemeSingleColorQuery;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceColorUtilities;
 
-import java.awt.*;
-
 /**
  * Fill painter that draws visuals with glass appearance. This class is part
  * of officially supported API.
  * 
  * @author Kirill Grouchnikov
  */
-public class GlassFillPainter extends StandardFillPainter {
-	@Override
-	public String getDisplayName() {
-		return "Glass";
-	}
-
-	@Override
-	public Color getTopFillColor(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(super.getBottomFillColor(fillScheme),
-				super.getMidFillColorTop(fillScheme), 0.6f);
-	}
-
-	@Override
-	public Color getMidFillColorTop(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(this.getTopFillColor(fillScheme),
-				super.getMidFillColorTop(fillScheme), 0.8f);
-	}
-
-	@Override
-	public Color getMidFillColorBottom(RadianceColorScheme fillScheme) {
-		return super.getMidFillColorTop(fillScheme);
+public class GlassFillPainter extends FractionBasedFillPainter {
+	public GlassFillPainter() {
+		super("Glass",
+				new float[] {0.0f, 0.4999999f, 0.5f, 1.0f},
+				new ColorSchemeSingleColorQuery[] {
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.4f),
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.52f),
+						ColorSchemeSingleColorQuery.MID,
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.7f),
+				}
+		);
 	}
 
-	@Override
-	public Color getBottomFillColor(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(this.getMidFillColorBottom(fillScheme),
-				super.getBottomFillColor(fillScheme), 0.7f);
-	}
 }
diff --git a/...g/src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/MatteFillPainter.java b/...g/src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/MatteFillPainter.java
@@ -29,49 +29,35 @@
  */
 package org.pushingpixels.radiance.theming.api.painter.fill;
 
-import org.pushingpixels.radiance.theming.api.colorscheme.RadianceColorScheme;
+import org.pushingpixels.radiance.theming.api.colorscheme.ColorSchemeSingleColorQuery;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceColorUtilities;
 
-import java.awt.*;
-
 /**
  * Fill painter that draws visuals with matte appearance. This class is part of
  * officially supported API.
  * 
  * @author Kirill Grouchnikov
  */
-public class MatteFillPainter extends ClassicFillPainter {
+public class MatteFillPainter extends FractionBasedFillPainter {
 	/**
 	 * Reusable instance of this painter.
 	 */
 	public static final MatteFillPainter INSTANCE = new MatteFillPainter();
 
 	/**
-	 * Creates a new matte fill painter.
+	 * Creates a new classic gradient painter.
 	 */
 	public MatteFillPainter() {
-		super();
-	}
-
-	@Override
-	public String getDisplayName() {
-		return "Matte";
-	}
-
-	@Override
-	public Color getTopFillColor(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(super.getBottomFillColor(fillScheme),
-				super.getMidFillColorTop(fillScheme), 0.5f);
-	}
-
-	@Override
-	public Color getMidFillColorTop(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(super.getMidFillColorTop(fillScheme),
-				super.getBottomFillColor(fillScheme), 0.7f);
-	}
-
-	@Override
-	public Color getBottomFillColor(RadianceColorScheme fillScheme) {
-		return super.getMidFillColorTop(fillScheme);
+		super("Matte",
+				new float[] {0.0f, 0.5f, 1.0f},
+				new ColorSchemeSingleColorQuery[] {
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.35f),
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.49f),
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getMidColor(), scheme.getUltraLightColor(), 0.7f),
+				}
+		);
 	}
 }
diff --git a/...a/org/pushingpixels/radiance/theming/api/painter/fill/SpecularRectangularFillPainter.java b/...a/org/pushingpixels/radiance/theming/api/painter/fill/SpecularRectangularFillPainter.java
@@ -89,8 +89,8 @@ public void paintContourBackground(Graphics g, Component comp, float width, floa
 
         if ((shineWidth > 0) && (shineHeight > 0)) {
             BufferedImage shineImage = getShineImage(comp, contour,
-                    RadianceColorUtilities.getTopShineColor(fillScheme),
-                    RadianceColorUtilities.getBottomShineColor(fillScheme),
+                    fillScheme.getUltraLightColor(),
+                    fillScheme.getLightColor(),
                     this.alpha, shineWidth, shineHeight);
 
             Graphics2D graphics = (Graphics2D) g.create();

diff --git a/...rc/main/java/org/pushingpixels/radiance/theming/api/painter/fill/StandardFillPainter.java b/...rc/main/java/org/pushingpixels/radiance/theming/api/painter/fill/StandardFillPainter.java
@@ -29,97 +29,25 @@
  */
 package org.pushingpixels.radiance.theming.api.painter.fill;
 
-import org.pushingpixels.radiance.theming.api.colorscheme.RadianceColorScheme;
+import org.pushingpixels.radiance.theming.api.colorscheme.ColorSchemeSingleColorQuery;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceColorUtilities;
 
-import java.awt.*;
-import java.awt.MultipleGradientPaint.CycleMethod;
-
 /**
  * Fill painter that draws visuals with subtle 3D gradient appearance. This class is part of
  * officially supported API.
  *
  * @author Kirill Grouchnikov
  */
-public class StandardFillPainter implements RadianceFillPainter {
-    @Override
-    public String getDisplayName() {
-        return "Standard";
-    }
-
-    @Override
-    public void paintContourBackground(Graphics g, Component comp, float width, float height,
-            Shape contour, RadianceColorScheme fillScheme) {
-
-        // long millis = System.nanoTime();
-
-        Graphics2D graphics = (Graphics2D) g.create();
-
-        Color topFillColor = this.getTopFillColor(fillScheme);
-        Color midFillColorTop = this.getMidFillColorTop(fillScheme);
-        Color midFillColorBottom = this.getMidFillColorBottom(fillScheme);
-        Color bottomFillColor = this.getBottomFillColor(fillScheme);
-
-        // Fill background
-        // long millis000 = System.nanoTime();
-
-        MultipleGradientPaint gradient = new LinearGradientPaint(0, 0, 0, height,
-                new float[]{0.0f, 0.4999999f, 0.5f, 1.0f},
-                new Color[]{topFillColor, midFillColorTop, midFillColorBottom, bottomFillColor},
-                CycleMethod.REPEAT);
-        graphics.setPaint(gradient);
-        graphics.fill(contour);
-
-        graphics.dispose();
-    }
-
-    /**
-     * Computes the color of the top portion of the fill. Override to provide different visual.
-     *
-     * @param fillScheme
-     *         The fill scheme.
-     * @return The color of the top portion of the fill.
-     */
-    public Color getTopFillColor(RadianceColorScheme fillScheme) {
-        return RadianceColorUtilities.getTopFillColor(fillScheme);
-    }
-
-    /**
-     * Computes the color of the middle portion of the fill from the top. Override to provide
-     * different visual.
-     *
-     * @param fillScheme
-     *         The fill scheme.
-     * @return The color of the middle portion of the fill from the top.
-     */
-    public Color getMidFillColorTop(RadianceColorScheme fillScheme) {
-        return RadianceColorUtilities.getMidFillColor(fillScheme);
-    }
-
-    /**
-     * Computes the color of the middle portion of the fill from the bottom. Override to provide
-     * different visual.
-     *
-     * @param fillScheme
-     *         The fill scheme.
-     * @return The color of the middle portion of the fill from the bottom.
-     */
-    public Color getMidFillColorBottom(RadianceColorScheme fillScheme) {
-        return this.getMidFillColorTop(fillScheme);
-    }
-
-    /**
-     * Computes the color of the bottom portion of the fill. Override to provide different visual.
-     *
-     * @param fillScheme
-     *         The fill scheme.
-     * @return The color of the bottom portion of the fill.
-     */
-    public Color getBottomFillColor(RadianceColorScheme fillScheme) {
-        return RadianceColorUtilities.getBottomFillColor(fillScheme);
-    }
-    @Override
-    public Color getRepresentativeColor(RadianceColorScheme fillScheme) {
-        return this.getMidFillColorTop(fillScheme);
+public class StandardFillPainter extends FractionBasedFillPainter {
+    public StandardFillPainter() {
+        super("Standard",
+                new float[] {0.0f, 0.5f, 1.0f},
+                new ColorSchemeSingleColorQuery[] {
+                        scheme -> RadianceColorUtilities.getInterpolatedColor(
+                                scheme.getDarkColor(), scheme.getMidColor(), 0.4f),
+                        ColorSchemeSingleColorQuery.MID,
+                        ColorSchemeSingleColorQuery.ULTRALIGHT
+                }
+        );
     }
 }
diff --git a/...src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/SubduedFillPainter.java b/...src/main/java/org/pushingpixels/radiance/theming/api/painter/fill/SubduedFillPainter.java
@@ -29,27 +29,25 @@
  */
 package org.pushingpixels.radiance.theming.api.painter.fill;
 
-import org.pushingpixels.radiance.theming.api.colorscheme.RadianceColorScheme;
+import org.pushingpixels.radiance.theming.api.colorscheme.ColorSchemeSingleColorQuery;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceColorUtilities;
 
-import java.awt.*;
-
 /**
  * Fill painter that draws visuals with subdued 3D gradient appearance. This
  * class is part of officially supported API.
  * 
  * @author Kirill Grouchnikov
  */
-public class SubduedFillPainter extends StandardFillPainter {
-	@Override
-	public String getDisplayName() {
-		return "Subdued";
-	}
-
-	@Override
-	public Color getTopFillColor(RadianceColorScheme fillScheme) {
-		return RadianceColorUtilities.getInterpolatedColor(super
-				.getTopFillColor(fillScheme), this
-				.getMidFillColorTop(fillScheme), 0.3);
+public class SubduedFillPainter extends FractionBasedFillPainter {
+	public SubduedFillPainter() {
+		super("Subdued",
+				new float[] {0.0f, 0.5f, 1.0f},
+				new ColorSchemeSingleColorQuery[] {
+						scheme -> RadianceColorUtilities.getInterpolatedColor(
+								scheme.getDarkColor(), scheme.getMidColor(), 0.12f),
+						ColorSchemeSingleColorQuery.MID,
+						ColorSchemeSingleColorQuery.ULTRALIGHT
+				}
+		);
 	}
 }
diff --git a/theming/src/main/java/org/pushingpixels/radiance/theming/internal/blade/BladeIconUtils.java b/theming/src/main/java/org/pushingpixels/radiance/theming/internal/blade/BladeIconUtils.java
@@ -31,11 +31,12 @@
 
 import org.pushingpixels.radiance.common.api.RadianceCommonCortex;
 import org.pushingpixels.radiance.theming.api.ComponentState;
+import org.pushingpixels.radiance.theming.api.colorscheme.ColorSchemeSingleColorQuery;
 import org.pushingpixels.radiance.theming.api.colorscheme.RadianceColorScheme;
 import org.pushingpixels.radiance.theming.api.painter.border.FlatBorderPainter;
 import org.pushingpixels.radiance.theming.api.painter.border.RadianceBorderPainter;
+import org.pushingpixels.radiance.theming.api.painter.fill.FractionBasedFillPainter;
 import org.pushingpixels.radiance.theming.api.painter.fill.RadianceFillPainter;
-import org.pushingpixels.radiance.theming.internal.painter.SimplisticFillPainter;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceColorUtilities;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceOutlineUtilities;
 import org.pushingpixels.radiance.theming.internal.utils.RadianceSizeUtils;
@@ -53,31 +54,22 @@ public class BladeIconUtils {
      *
      * @author Kirill Grouchnikov
      */
-    private static class SimplisticSoftBorderReverseFillPainter extends SimplisticFillPainter {
+    private static class SimplisticSoftBorderReverseFillPainter extends FractionBasedFillPainter {
         /**
          * Singleton instance.
          */
         public static final RadianceFillPainter INSTANCE = new SimplisticSoftBorderReverseFillPainter();
 
-        /**
-         * Private constructor.
-         */
         private SimplisticSoftBorderReverseFillPainter() {
-        }
-
-        @Override
-        public String getDisplayName() {
-            return "Simplistic Soft Border Reverse";
-        }
-
-        @Override
-        public Color getTopFillColor(RadianceColorScheme fillScheme) {
-            return super.getBottomFillColor(fillScheme);
-        }
-
-        @Override
-        public Color getBottomFillColor(RadianceColorScheme fillScheme) {
-            return super.getTopFillColor(fillScheme);
+            super("Simplistic Soft Border Reverse",
+                    new float[] {0.0f, 0.5f, 1.0f},
+                    new ColorSchemeSingleColorQuery[] {
+                            ColorSchemeSingleColorQuery.ULTRALIGHT,
+                            scheme -> RadianceColorUtilities.getInterpolatedColor(
+                                    scheme.getMidColor(), scheme.getUltraLightColor(), 0.5f),
+                            ColorSchemeSingleColorQuery.MID
+                    }
+            );
         }
     }