From 28011b7151f5b2edd9b829682207e74ec73ed805 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 27 Dec 2023 19:40:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E4=B9=9F=E6=94=B9?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=88=90=E5=91=98=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/webattr/EditToolBar.java | 4 ++-- .../main/java/com/fr/design/webattr/FToolBar.java | 12 ++++++------ .../main/java/com/fr/design/webattr/ToolBarPane.java | 2 +- 3 files changed, 9 insertions(+), 9 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 2ec213faf..17d411706 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 @@ -228,7 +228,7 @@ public class EditToolBar extends BasicPane { this.defaultCheckBox.setSelected(ftoolbar.isDefault() ? true : false); if (bgColorButtonGroup != null) { - this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColorType().getCode()); + this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColorMode().getCode()); } } @@ -264,7 +264,7 @@ public class EditToolBar extends BasicPane { ftoolBar.setBackground(this.background); } if (bgColorButtonGroup != null) { - ftoolBar.setButtonBgColorType(ColorMode.getTypeByCode(bgColorButtonGroup.getSelectedIndex())); + ftoolBar.setButtonBgColorMode(ColorMode.getModeByCode(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 9af8849ce..d48b466f1 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 @@ -13,7 +13,7 @@ public class FToolBar { private Background background = null; private boolean isDefault = true; - private ColorMode buttonBgColorType = ColorMode.AUTO; + private ColorMode buttonBgColorMode = ColorMode.AUTO; public List getButtonlist() { return buttonlist; } @@ -54,12 +54,12 @@ public class FToolBar { this.isDefault = isDefault; } - public ColorMode getButtonBgColorType() { - return buttonBgColorType; + public ColorMode getButtonBgColorMode() { + return buttonBgColorMode; } - public void setButtonBgColorType(ColorMode buttonBgColorType) { - this.buttonBgColorType = buttonBgColorType; + public void setButtonBgColorMode(ColorMode buttonBgColorMode) { + this.buttonBgColorMode = buttonBgColorMode; } public ToolBar getToolBar() { @@ -70,7 +70,7 @@ public class FToolBar { ToolBar toolBar = new ToolBar(n); toolBar.setBackground(this.background); toolBar.setDefault(this.isDefault); - toolBar.setButtonBgColorType(this.buttonBgColorType); + toolBar.setButtonBgColorMode(this.buttonBgColorMode); return toolBar; } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java index 8cfed8799..389612522 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java @@ -157,7 +157,7 @@ public class ToolBarPane extends BasicBeanPane { } this.getFToolBar().setBackground(toolbar.getBackground()); this.getFToolBar().setDefault(toolbar.isDefault()); - this.getFToolBar().setButtonBgColorType(toolbar.getButtonBgColorType()); + this.getFToolBar().setButtonBgColorMode(toolbar.getButtonBgColorMode()); setPopulateFinished(true); }