From ea0e6990432b2126198950a90ce9398dc6ffb202 Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 15 Dec 2023 10:18:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=BD=E5=B8=B8=E9=87=8F=202?= =?UTF-8?q?=E3=80=81=E5=88=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java | 4 ++-- .../java/com/fr/design/widgettheme/BaseStyleSettingPane.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java index 9d568c2be6..92300b00b9 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java @@ -77,7 +77,7 @@ public class WidgetStyleEditPane extends BasicBeanPane< } private void initCommonStyleEditor() { - colorSelectBox = new NewColorSelectBox(140, true); + colorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true); colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR); initLineBox(); borderRadiusSpinner = new UISpinner(0, Integer.MAX_VALUE, 1); @@ -86,7 +86,7 @@ public class WidgetStyleEditPane extends BasicBeanPane< } protected void initTextStylePane() { - textStylePane = new WidgetTextStylePane(FRFontPane.getFontSizes(), 140); + textStylePane = new WidgetTextStylePane(FRFontPane.getFontSizes(), WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH); } /** diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java index 0acee5550e..9e1e1eb4cf 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java @@ -270,14 +270,12 @@ public abstract class BaseStyleSettingPane extends BasicBeanPa borderRadiusSpinner.setValue(BorderStyle.DEFAULT_BORDER_RADIUS); } if (textStylePane != null) { - //后面看看怎么设置默认背景色 textStylePane.setTextStyle(new TextStyle()); } if (frFontPane != null) { frFontPane.populateBean(FRFont.getInstance()); } if (selectBgColorBox != null) { - //后面看看怎么设置默认背景色 selectBgColorBox.setSelectObject(null); } }