Browse Source

REPORT-144782【主题二期-取色器优化】【设计变动】衍生规则改变,后台适配

feature/x
kerry 2 months ago
parent
commit
d29ec6cc05
  1. 15
      designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

15
designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@ -456,7 +456,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
*/ */
private enum DeriveAlgorithm { private enum DeriveAlgorithm {
/** /**
* 调整明度和纯度 * 通用的衍生规则
*/ */
PLAIN_ALGORITHM { PLAIN_ALGORITHM {
public Color[] getDeriveColorArr(Color color, int defaultDeriveCount) { public Color[] getDeriveColorArr(Color color, int defaultDeriveCount) {
@ -465,12 +465,21 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
}, },
/** /**
* 只调整明度 * 默认的衍生规则主要针对字体和背景
*/ */
DEFAULT_DERIVE_ALGORITHM { DEFAULT_DERIVE_ALGORITHM {
public Color[] getDeriveColorArr(Color color, int defaultDeriveCount) { public Color[] getDeriveColorArr(Color color, int defaultDeriveCount) {
return FineColorDeriveState.getDeriveColorArr(color, true, defaultDeriveCount); return FineColorDeriveState.getDeriveColorArr(color, true, defaultDeriveCount);
} }
},
/**
* FVS背景衍生规则
*/
FVS_BACKGROUND_DERIVE_ALGORITHM {
public Color[] getDeriveColorArr(Color color, int defaultDeriveCount) {
return FineColorDeriveState.getDeriveColorArrByBrightness(FineColorDeriveState.DERIVE_UP_AND_DOWN, color, defaultDeriveCount);
}
}; };
public abstract Color[] getDeriveColorArr(Color color, int defaultDeriveCount); public abstract Color[] getDeriveColorArr(Color color, int defaultDeriveCount);
@ -510,7 +519,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
FVS { FVS {
public List<ColorConfig> getColorConfigs() { public List<ColorConfig> getColorConfigs() {
ArrayList<ColorConfig> colorConfigs = new ArrayList<>(); ArrayList<ColorConfig> colorConfigs = new ArrayList<>();
colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM)); colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.FVS_BACKGROUND_DERIVE_ALGORITHM));
colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM)); colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM));
colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));

Loading…
Cancel
Save