From 5c71eb243761c4a7703bcedfff39c84239d4c768 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Fri, 22 Dec 2023 13:53:09 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-111723=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=E3=80=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=A8=A1=E6=9D=BF=E4=B8=BB=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=92=8C=E6=A0=87=E7=AD=BE=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/widgettheme/BaseStyleSettingPane.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 c15a504d7..b651b9373 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
@@ -217,7 +217,7 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
         setLineComboBox(widgetStyle);
         setBorderRadiusSpinner(widgetStyle);
         setTextStylePane(widgetStyle);
-        setFrFontPane();
+        setFrFontPane(widgetStyle);
         setButtonStyleDefinedPane(widgetStyle);
         setSelectBgColor(widgetStyle);
     }
@@ -257,9 +257,9 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
         this.fontColorButton.setColor(textStyle.getFontColor());
     }
 
-    private void setFrFontPane() {
+    private void setFrFontPane(ThemedWidgetStyle widgetStyle) {
         if (frFontPane != null) {
-            frFontPane.populateBean(FRFont.getInstance());
+            frFontPane.populateBean(widgetStyle.getFontStyle().getFont());
         }
     }