|
|
|
@ -225,7 +225,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
|
|
|
|
|
if (standardColors == null || standardColors.size() < 8) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
for (int i = 0; i < standardColors.size(); i++) { |
|
|
|
|
// 如果颜色数量超过了主题色数量,只取主题色数量
|
|
|
|
|
int range = Math.min(standardColors.size(), this.themeColorCellGrid.length - 2); |
|
|
|
|
for (int i = 0; i < range; i++) { |
|
|
|
|
Color standardColor = standardColors.get(i); |
|
|
|
|
ColorConfig colorConfig = getColorConfig(colorSelector, i); |
|
|
|
|
Color[] deriveColorArr = colorConfig.getDeriveColorArr(standardColor, DEFAULT_DERIVE_COUNT); |
|
|
|
|