Browse Source

Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~lidongy/design into release/11.0

release/11.0
lidongy 1 month ago
parent
commit
61e7155d14
  1. 4
      designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
  2. 2
      settings.gradle

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

@ -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++) {
// range取最小值,避免数据越界
int range = Math.min(standardColors.size(), this.themeColorCellGrid.length);
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);

2
settings.gradle

@ -1,7 +1,7 @@
pluginManagement {
repositories {
maven {
url 'http://mvn.finedevelop.com/repository/maven-public/'
url 'https://mvn.fanruan.com/repository/maven-public/'
}
gradlePluginPortal()
}

Loading…
Cancel
Save