From a411e490e7c3ecad8e567340db5860ae66dba90c Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 19 Feb 2024 14:21:53 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-114501=20=E3=80=90=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA-=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E3=80=91=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=BC=A0=E5=88=B0=E5=89=8D=E7=AB=AF=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widgettheme/common/EditorSettingPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java index ea547eb674..17bbbe2c12 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java @@ -78,6 +78,7 @@ public class EditorSettingPane extends BaseStyleSettingPane colorSelectBox.setSelectObject(editorTheme.getThemeColor()); lineComboBox.setSelectedLineStyle(editorTheme.getBorderStyle().getLineType()); borderRadiusSpinner.setValue(editorTheme.getBorderStyle().getRadius()); + borderColorSelectBox.setSelectObject(editorTheme.getBorderStyle().getBorderColor()); widgetBgColorSelectBox.setSelectObject(ColorUtils.ignoreColorAlpha(editorTheme.getWidgetBackground().getColor())); widgetBgAlphaDragPane.populateBean(ColorUtils.roundColorAlphaDouble(editorTheme.getWidgetBackground().getColor())); iconColorSelectBox.setSelectObject(editorTheme.getIconColor()); @@ -110,6 +111,7 @@ public class EditorSettingPane extends BaseStyleSettingPane editorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject()); editorTheme.setBorderStyle(new BorderStyle((int) borderRadiusSpinner.getValue(), lineComboBox.getSelectedLineStyle(), borderColorSelectBox.getSelectObject())); editorTheme.setWidgetBackground(ColorUtils.createColorBackgroundWithAlpha(widgetBgColorSelectBox.getSelectObject(), widgetBgAlphaDragPane.updateBean())); + editorTheme.setIconColor(iconColorSelectBox.getSelectObject()); assignFontSizeStyle(editorTheme); switchCard(); }