From d29ec6cc05b095d8a9910018064883343a1dec18 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 20 Dec 2024 14:16:05 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-144782=E3=80=90=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E4=BA=8C=E6=9C=9F-=E5=8F=96=E8=89=B2=E5=99=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E3=80=90=E8=AE=BE=E8=AE=A1=E5=8F=98=E5=8A=A8?= =?UTF-8?q?=E3=80=91=E8=A1=8D=E7=94=9F=E8=A7=84=E5=88=99=E6=94=B9=E5=8F=98?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E5=8F=B0=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/style/color/NewColorSelectPane.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index 3a9c37a5f1..fe972c50ee 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/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 { /** - * 调整明度和纯度 + * 通用的衍生规则 */ PLAIN_ALGORITHM { public Color[] getDeriveColorArr(Color color, int defaultDeriveCount) { @@ -465,12 +465,21 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { }, /** - * 只调整明度 + * 默认的衍生规则，主要针对字体和背景 */ DEFAULT_DERIVE_ALGORITHM { public Color[] getDeriveColorArr(Color color, int 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); @@ -510,7 +519,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { FVS { public List getColorConfigs() { ArrayList 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.PLAIN_ALGORITHM)); colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));