|
|
@ -66,10 +66,7 @@ public class ColorListExtendedPane extends JPanel implements MouseListener { |
|
|
|
public void populate(List<Color> colors) { |
|
|
|
public void populate(List<Color> colors) { |
|
|
|
if (colors.size() > 0) { |
|
|
|
if (colors.size() > 0) { |
|
|
|
colorList.clear(); |
|
|
|
colorList.clear(); |
|
|
|
for (int i = 0; i < colorCount; i++) { |
|
|
|
colorList.addAll(colors); |
|
|
|
Color color = colors.get(i % colorCount); |
|
|
|
|
|
|
|
colorList.add(color); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
repaint(); |
|
|
|
repaint(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -132,7 +129,7 @@ public class ColorListExtendedPane extends JPanel implements MouseListener { |
|
|
|
super.paint(g); |
|
|
|
super.paint(g); |
|
|
|
Color oldColor = g.getColor(); |
|
|
|
Color oldColor = g.getColor(); |
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < colorList.size(); i++) { |
|
|
|
for (int i = 0; i < colorCount; i++) { |
|
|
|
int x = i * (boxSize + boxGap); |
|
|
|
int x = i * (boxSize + boxGap); |
|
|
|
for (int j = 0; j < extendedCount; j++) { |
|
|
|
for (int j = 0; j < extendedCount; j++) { |
|
|
|
Color color = extendedColorComputer.computeExtendedColor(colorList.get(i), j, extendedCount); |
|
|
|
Color color = extendedColorComputer.computeExtendedColor(colorList.get(i), j, extendedCount); |
|
|
|