Browse Source

方法名也改下,以及成员变量名

release/11.0
obo 11 months ago
parent
commit
28011b7151
  1. 4
      designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
  2. 12
      designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java
  3. 2
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java

4
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); this.defaultCheckBox.setSelected(ftoolbar.isDefault() ? true : false);
if (bgColorButtonGroup != null) { 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); ftoolBar.setBackground(this.background);
} }
if (bgColorButtonGroup != null) { if (bgColorButtonGroup != null) {
ftoolBar.setButtonBgColorType(ColorMode.getTypeByCode(bgColorButtonGroup.getSelectedIndex())); ftoolBar.setButtonBgColorMode(ColorMode.getModeByCode(bgColorButtonGroup.getSelectedIndex()));
} }
return ftoolBar; return ftoolBar;
} }

12
designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java

@ -13,7 +13,7 @@ public class FToolBar {
private Background background = null; private Background background = null;
private boolean isDefault = true; private boolean isDefault = true;
private ColorMode buttonBgColorType = ColorMode.AUTO; private ColorMode buttonBgColorMode = ColorMode.AUTO;
public List<ToolBarButton> getButtonlist() { public List<ToolBarButton> getButtonlist() {
return buttonlist; return buttonlist;
} }
@ -54,12 +54,12 @@ public class FToolBar {
this.isDefault = isDefault; this.isDefault = isDefault;
} }
public ColorMode getButtonBgColorType() { public ColorMode getButtonBgColorMode() {
return buttonBgColorType; return buttonBgColorMode;
} }
public void setButtonBgColorType(ColorMode buttonBgColorType) { public void setButtonBgColorMode(ColorMode buttonBgColorMode) {
this.buttonBgColorType = buttonBgColorType; this.buttonBgColorMode = buttonBgColorMode;
} }
public ToolBar getToolBar() { public ToolBar getToolBar() {
@ -70,7 +70,7 @@ public class FToolBar {
ToolBar toolBar = new ToolBar(n); ToolBar toolBar = new ToolBar(n);
toolBar.setBackground(this.background); toolBar.setBackground(this.background);
toolBar.setDefault(this.isDefault); toolBar.setDefault(this.isDefault);
toolBar.setButtonBgColorType(this.buttonBgColorType); toolBar.setButtonBgColorMode(this.buttonBgColorMode);
return toolBar; return toolBar;
} }
} }

2
designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java

@ -157,7 +157,7 @@ public class ToolBarPane extends BasicBeanPane<ToolBar> {
} }
this.getFToolBar().setBackground(toolbar.getBackground()); this.getFToolBar().setBackground(toolbar.getBackground());
this.getFToolBar().setDefault(toolbar.isDefault()); this.getFToolBar().setDefault(toolbar.isDefault());
this.getFToolBar().setButtonBgColorType(toolbar.getButtonBgColorType()); this.getFToolBar().setButtonBgColorMode(toolbar.getButtonBgColorMode());
setPopulateFinished(true); setPopulateFinished(true);
} }

Loading…
Cancel
Save