From e26869085a774d02112afb33e31846397440b037 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Thu, 2 Sep 2021 15:07:40 +0800
Subject: [PATCH] =?UTF-8?q?CHART-20536=20=E5=9B=BE=E8=A1=A8=E9=A2=84?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=85=8D=E8=89=B2=EF=BC=8C=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=90=8E=EF=BC=8C=E4=B8=BB=E9=A2=98=E9=85=8D?=
 =?UTF-8?q?=E8=89=B2=E9=9D=A2=E6=9D=BF=E5=86=85=E5=AE=B9=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
1. 兼容主题支持当前图表预定义配色
2. 图表预定义配色的数量导致主题色中实际颜色的数量可能
超过八个（但用户在界面上只能看到并编辑前八个），因此
需要调整下颜色选择面板等组件

【改动思路】
同上
---
 .../theme/edit/ui/ColorListExtendedPane.java          |  7 ++-----
 .../design/mainframe/theme/edit/ui/ColorListPane.java | 11 +++++++----
 .../com/fr/design/style/color/NewColorSelectPane.java |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListExtendedPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListExtendedPane.java
index 4aac8562d..9d02180e7 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListExtendedPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListExtendedPane.java
@@ -66,10 +66,7 @@ public class ColorListExtendedPane extends JPanel implements MouseListener {
     public void populate(List<Color> colors) {
         if (colors.size() > 0) {
             colorList.clear();
-            for (int i = 0; i < colorCount; i++) {
-                Color color = colors.get(i % colorCount);
-                colorList.add(color);
-            }
+            colorList.addAll(colors);
             repaint();
         }
     }
@@ -132,7 +129,7 @@ public class ColorListExtendedPane extends JPanel implements MouseListener {
         super.paint(g);
         Color oldColor = g.getColor();
 
-        for (int i = 0; i < colorList.size(); i++) {
+        for (int i = 0; i < colorCount; i++) {
             int x = i * (boxSize + boxGap);
             for (int j = 0; j < extendedCount; j++) {
                 Color color = extendedColorComputer.computeExtendedColor(colorList.get(i), j, extendedCount);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java
index 2bf1931f1..adeca3d7a 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java
@@ -88,10 +88,13 @@ public class ColorListPane extends JPanel implements UIObserver {
     }
 
     public void populate(List<Color> colors) {
-        for (int i = 0; i < colors.size() && i < colorList.size(); i++) {
-            Color color = colors.get(i % colorCount);
-            colorList.set(i, color);
-            colorButtons.get(i).setSelectObject(color);
+        colorList.clear();
+        for (int i = 0; i < colors.size(); i++) {
+            Color color = colors.get(i);
+            colorList.add(color);
+            if (i < colorCount) {
+                colorButtons.get(i).setSelectObject(color);
+            }
         }
     }
 
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 8abab768a..6a5bcb78b 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
@@ -206,7 +206,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
                 }
             }
         }
-        if (standardColors == null || standardColors.size() != 8) {
+        if (standardColors == null || standardColors.size() < 8) {
             return;
         }