From d729ea1e50fa22f6080f2a3597f26cb82d29791a Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 27 Dec 2023 19:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E5=91=BD=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=B7=B1=E6=B5=85=E6=A8=A1=E5=BC=8F=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BD=9C=E4=B8=BA=E5=85=AC=E5=85=B1=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E5=BE=80=E4=B8=8A=E6=8A=BD=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/webattr/EditToolBar.java  | 4 ++--
 .../src/main/java/com/fr/design/webattr/FToolBar.java     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
index 56798e501..2ec213faf 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
@@ -30,7 +30,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.IconDefinePane;
 import com.fr.form.ui.Button;
 import com.fr.form.ui.CustomToolBarButton;
-import com.fr.form.ui.ToolBarButtonBgColorType;
+import com.fr.general.ColorMode;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetInfoConfig;
 import com.fr.general.Background;
@@ -264,7 +264,7 @@ public class EditToolBar extends BasicPane {
             ftoolBar.setBackground(this.background);
         }
         if (bgColorButtonGroup != null) {
-            ftoolBar.setButtonBgColorType(ToolBarButtonBgColorType.getTypeByCode(bgColorButtonGroup.getSelectedIndex()));
+            ftoolBar.setButtonBgColorType(ColorMode.getTypeByCode(bgColorButtonGroup.getSelectedIndex()));
         }
         return ftoolBar;
     }
diff --git a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java
index a5202b294..9af8849ce 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fr.form.ui.ToolBar;
-import com.fr.form.ui.ToolBarButtonBgColorType;
+import com.fr.general.ColorMode;
 import com.fr.form.ui.Widget;
 import com.fr.general.Background;
 
@@ -13,7 +13,7 @@ public class FToolBar {
 	private Background background = null;
 	private boolean isDefault = true;
 
-	private ToolBarButtonBgColorType buttonBgColorType = ToolBarButtonBgColorType.AUTO;
+	private ColorMode buttonBgColorType = ColorMode.AUTO;
 	public List<ToolBarButton> getButtonlist() {
 		return buttonlist;
 	}
@@ -54,11 +54,11 @@ public class FToolBar {
 		this.isDefault = isDefault;
 	}
 
-	public ToolBarButtonBgColorType getButtonBgColorType() {
+	public ColorMode getButtonBgColorType() {
 		return buttonBgColorType;
 	}
 
-	public void setButtonBgColorType(ToolBarButtonBgColorType buttonBgColorType) {
+	public void setButtonBgColorType(ColorMode buttonBgColorType) {
 		this.buttonBgColorType = buttonBgColorType;
 	}