diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java index 2b51b3b9e4..dee0ee5708 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java @@ -24,7 +24,7 @@ import java.awt.Graphics2D; * 图表的缩略图Icon, 在选择图表类型界面 用到. */ public class ChartIcon implements Icon, XMLable { - private static final int WIDTH = FineUIScale.scale(215); + private static final int WIDTH = FineUIScale.scale(210); private static final int HEIGHT = FineUIScale.scale(100); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index 1cfdde0a19..dd773eea1d 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -7,6 +7,7 @@ import com.fine.swing.ui.layout.Column; import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineUIStyle; import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.chartattr.ChartCollection; @@ -24,7 +25,6 @@ import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.van.chart.config.DefaultStyleHelper4Van; -import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; import javax.swing.JLayer; @@ -74,6 +74,7 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven JLayer typeScrollPane = FineUIUtils.createCollapsibleScrollBarLayer(mainTypeList); iconViewList = new JList(); + iconViewList.setBorder(null); iconListModel = new DefaultListModel(); iconViewList.setModel(iconListModel); @@ -104,20 +105,20 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven ChartIcon chartIcon = (ChartIcon) value; UILabel centerImg = new UILabel(chartIcon); UILabel text = new UILabel(getChartName(chartIcon), SwingConstants.CENTER); - - Column component = column( - fix(5), - cell(centerImg), cell(text), - fix(5) - ).getComponent(); - Color borderColor = isSelected ? FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor") - : FineUIUtils.getUIColor("defaultBorderColor", "Component.borderColor"); + Color borderColor = isSelected ? FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor") : + FineUIUtils.getUIColor("defaultBorderColor", "Component.borderColor"); + Color fillColor = FlatUIUtils.getUIColor("fill.normal", Color.WHITE); UIRoundedBorder roundedBorder = new UIRoundedBorder(borderColor, 1, 5); - component.setBorder(BorderFactory.createCompoundBorder( - new ScaledEmptyBorder(0, 10, 10, 0), roundedBorder)); - component.setBackground(Color.WHITE); - return component; - + Column component = column( + fix(5), cell(centerImg), cell(text), fix(5) + ).with(it -> { + it.setOpaque(true); + it.setBorder(roundedBorder); + it.setBackground(fillColor); + }).getComponent(); + JPanel pane = FineLayoutBuilder.asBorderLayoutWrapped(component); + pane.setBorder(new ScaledEmptyBorder(0, 10, 10, 0)); + return pane; } return this; }