|
42 | 42 | import org.pushingpixels.radiance.theming.api.painter.border.FractionBasedTonalBorderPainter;
|
43 | 43 | import org.pushingpixels.radiance.theming.api.painter.decoration.MatteDecorationPainter;
|
44 | 44 | import org.pushingpixels.radiance.theming.api.painter.fill.ClassicFillPainter;
|
45 |
| -import org.pushingpixels.radiance.theming.api.painter.fill.ClassicTonalFillPainter; |
46 | 45 | import org.pushingpixels.radiance.theming.api.painter.fill.FractionBasedFillPainter;
|
47 | 46 | import org.pushingpixels.radiance.theming.api.painter.fill.FractionBasedTonalFillPainter;
|
48 | 47 | import org.pushingpixels.radiance.theming.api.painter.overlay.*;
|
@@ -253,12 +252,22 @@ public MarinerTonalSkin() {
|
253 | 252 | /* seed */ Hct.fromInt(0xFFF5D47A),
|
254 | 253 | /* isFidelity */ true,
|
255 | 254 | /* isDark */ false);
|
| 255 | + ContainerColorTokens marinerSelectedHighlightContainerTokens = |
| 256 | + ColorSchemeUtils.getContainerTokens( |
| 257 | + /* seed */ Hct.fromInt(0xFFF7D997), |
| 258 | + /* isFidelity */ true, |
| 259 | + /* isDark */ false); |
256 | 260 |
|
257 | 261 | RadianceColorSchemeBundle2 marinerDefaultBundle =
|
258 | 262 | new RadianceColorSchemeBundle2(marinerColorScheme);
|
259 | 263 | // More saturated seed for controls in selected state
|
260 | 264 | marinerDefaultBundle.registerActiveContainerTokens(marinerSelectedContainerTokens,
|
261 | 265 | ComponentState.SELECTED);
|
| 266 | + // And less saturated seed for selected highlights |
| 267 | + marinerDefaultBundle.registerActiveContainerTokens( |
| 268 | + marinerSelectedHighlightContainerTokens, |
| 269 | + RadianceThemingSlices.ContainerColorTokensAssociationKind.HIGHLIGHT, |
| 270 | + ComponentState.SELECTED); |
262 | 271 | this.registerDecorationAreaSchemeBundle(marinerDefaultBundle,
|
263 | 272 | RadianceThemingSlices.DecorationAreaType.NONE);
|
264 | 273 |
|
@@ -331,7 +340,13 @@ public MarinerTonalSkin() {
|
331 | 340 | ContainerColorTokensSingleColorQuery.CONTAINER_SURFACE_HIGH});
|
332 | 341 |
|
333 | 342 | this.decorationPainter = new MatteDecorationPainter();
|
334 |
| - this.highlightFillPainter = new ClassicTonalFillPainter(); |
| 343 | + this.highlightFillPainter = new FractionBasedTonalFillPainter("Mariner", |
| 344 | + new float[] {0.0f, 0.5f, 1.0f}, |
| 345 | + new ContainerColorTokensSingleColorQuery[] { |
| 346 | + ContainerColorTokensSingleColorQuery.CONTAINER_SURFACE_HIGH, |
| 347 | + ContainerColorTokensSingleColorQuery.CONTAINER_SURFACE, |
| 348 | + ContainerColorTokensSingleColorQuery.CONTAINER_SURFACE_LOW |
| 349 | + }); |
335 | 350 |
|
336 | 351 | this.borderPainter = new FractionBasedTonalBorderPainter("Mariner",
|
337 | 352 | new float[] {0.0f, 1.0f},
|
|
0 commit comments