From d8dc0e6e38c6e63b7b407a05123b4f73b60b8d75 Mon Sep 17 00:00:00 2001 From: lemon Date: Wed, 4 Sep 2024 15:10:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/style/color/ColorAdjustPane.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java index 829a027145..7e832c0f56 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java @@ -130,21 +130,25 @@ public class ColorAdjustPane extends JPanel implements UIObserver { colorButtons.get(j).setLastButton(false); panel.add(colorButtons.get(j)); } - if (i + maxCountOfRow > colorButtons.size() && colorButtons.size() != MAX_BUTTON) { - panel.add(new AddColorButton()); - this.add(panel); - } else if (i + maxCountOfRow == colorButtons.size() && colorButtons.size() != MAX_BUTTON) { - this.add(panel); - this.add(new AddColorButton()); - } else { - this.add(panel); - } + addPanel(panel, i); } if (colorButtons.size() == 1) { colorButtons.get(0).setLastButton(true); } } + private void addPanel(JPanel panel, int index) { + if (index + maxCountOfRow > colorButtons.size() && colorButtons.size() != MAX_BUTTON) { + panel.add(new AddColorButton()); + this.add(panel); + } else if (index + maxCountOfRow == colorButtons.size() && colorButtons.size() != MAX_BUTTON) { + this.add(panel); + this.add(new AddColorButton()); + } else { + this.add(panel); + } + } + private void createColorButton(Color[] colors) { colorButtons.clear(); int size = Math.min(colors.length, MAX_BUTTON);