Skip to content

Commit c327faa

Browse files
Tweak the highlight visuals of tonal Mariner
For #400
1 parent fe446fd commit c327faa

File tree

1 file changed

+17
-2
lines changed
  • theming/src/main/java/org/pushingpixels/radiance/theming/api/skin

1 file changed

+17
-2
lines changed

theming/src/main/java/org/pushingpixels/radiance/theming/api/skin/MarinerSkin.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.pushingpixels.radiance.theming.api.painter.border.FractionBasedTonalBorderPainter;
4343
import org.pushingpixels.radiance.theming.api.painter.decoration.MatteDecorationPainter;
4444
import org.pushingpixels.radiance.theming.api.painter.fill.ClassicFillPainter;
45-
import org.pushingpixels.radiance.theming.api.painter.fill.ClassicTonalFillPainter;
4645
import org.pushingpixels.radiance.theming.api.painter.fill.FractionBasedFillPainter;
4746
import org.pushingpixels.radiance.theming.api.painter.fill.FractionBasedTonalFillPainter;
4847
import org.pushingpixels.radiance.theming.api.painter.overlay.*;
@@ -253,12 +252,22 @@ public MarinerTonalSkin() {
253252
/* seed */ Hct.fromInt(0xFFF5D47A),
254253
/* isFidelity */ true,
255254
/* isDark */ false);
255+
ContainerColorTokens marinerSelectedHighlightContainerTokens =
256+
ColorSchemeUtils.getContainerTokens(
257+
/* seed */ Hct.fromInt(0xFFF7D997),
258+
/* isFidelity */ true,
259+
/* isDark */ false);
256260

257261
RadianceColorSchemeBundle2 marinerDefaultBundle =
258262
new RadianceColorSchemeBundle2(marinerColorScheme);
259263
// More saturated seed for controls in selected state
260264
marinerDefaultBundle.registerActiveContainerTokens(marinerSelectedContainerTokens,
261265
ComponentState.SELECTED);
266+
// And less saturated seed for selected highlights
267+
marinerDefaultBundle.registerActiveContainerTokens(
268+
marinerSelectedHighlightContainerTokens,
269+
RadianceThemingSlices.ContainerColorTokensAssociationKind.HIGHLIGHT,
270+
ComponentState.SELECTED);
262271
this.registerDecorationAreaSchemeBundle(marinerDefaultBundle,
263272
RadianceThemingSlices.DecorationAreaType.NONE);
264273

@@ -331,7 +340,13 @@ public MarinerTonalSkin() {
331340
ContainerColorTokensSingleColorQuery.CONTAINER_SURFACE_HIGH});
332341

333342
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+
});
335350

336351
this.borderPainter = new FractionBasedTonalBorderPainter("Mariner",
337352
new float[] {0.0f, 1.0f},

0 commit comments

Comments
 (0)