removed carbon color adjustment option

src/mol-theme/color/element-symbol.ts

@@ -12,7 +12,7 @@ import { ColorTheme } from '../color';
 import { ParamDefinition as PD } from '../../mol-util/param-definition';
 import { ThemeDataContext } from '../theme';
 import { TableLegend } from '../../mol-util/legend';
-import { getAdjustedColor, getAdjustedColorMap } from '../../mol-util/color/color';
+import { getAdjustedColorMap } from '../../mol-util/color/color';
 import { getColorMapParams } from '../../mol-util/color/params';
 import { ChainIdColorTheme, ChainIdColorThemeParams } from './chain-id';
 import { OperatorNameColorThemeParams, OperatorNameColorTheme } from './operator-name';
@@ -41,7 +41,6 @@ export const ElementSymbolColorThemeParams = {
     }, { description: 'Use chain-id coloring for carbon atoms.' }),
     saturation: PD.Numeric(0, { min: -6, max: 6, step: 0.1 }),
     lightness: PD.Numeric(0.2, { min: -6, max: 6, step: 0.1 }),
-    adjustCarbonColor: PD.Boolean(false, { description: 'apply the saturation and lightness adjustments to the carbon color' }),
     colors: PD.MappedStatic('default', {
         'default': PD.EmptyGroup(),
         'custom': PD.Group(getColorMapParams(ElementSymbolColors))
@@ -70,11 +69,9 @@ export function ElementSymbolColorTheme(ctx: ThemeDataContext, props: PD.Values<
                             pcc.name === 'element-symbol' ? undefined :
                                 assertUnreachable(pcc);
 
-    const getFinalCarbonColor = props.adjustCarbonColor ? getAdjustedColor : (color: Color) => color;
-
     function elementColor(element: ElementSymbol, location: Location) {
         return (carbonColor && element === 'C')
-            ? getFinalCarbonColor(carbonColor(location, false), props.saturation, props.lightness)
+            ? carbonColor(location, false)
             : elementSymbolColor(colorMap, element);
     }
 

src/mol-util/color/color.ts

@@ -166,16 +166,13 @@ export function ColorMap<T extends { [k: string]: number }>(o: T) { return o as
 export function getAdjustedColorMap<T extends { [k: string]: number }>(map: ColorMap<T>, saturation: number, lightness: number) {
     const adjustedMap: { [k: string]: Color } = {};
     for (const e in map) {
-        adjustedMap[e] = getAdjustedColor(map[e], saturation, lightness);
+        let c = map[e];
+        c = Color.saturate(c, saturation);
+        c = Color.darken(c, -lightness);
+        adjustedMap[e] = c;
     }
     return adjustedMap as ColorMap<T>;
 }
-export function getAdjustedColor(color: Color, saturation: number, lightness: number) {
-    let c = color;
-    c = Color.saturate(c, saturation);
-    c = Color.darken(c, -lightness);
-    return c;
-}
 
 export type ColorSwatch = [string, Color][]
 export function ColorSwatch(l: [string, number][]) { return l as unknown as ColorSwatch; }