Browse Source

Merge remote-tracking branch 'origin/fbp/release' into fbp/release

fbp/merge
Destiny.Lin 4 months ago
parent
commit
2f76192335
  1. 2
      designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
  2. 2
      designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

2
designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java

@ -170,7 +170,7 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
this.setProgress(100); this.setProgress(100);
FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!"); FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!");
FineJOptionPane.showMessageDialog( FineJOptionPane.showSuccessMessageDialog(
DesignerContext.getDesignerFrame(), DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name); Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name);

2
designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@ -462,7 +462,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
int size = colors.length; int size = colors.length;
for (int i = 1; i <= total; i++) { for (int i = 1; i <= total; i++) {
ColorCell cell = (ColorCell) this.pane.getComponent(i); ColorCell cell = (ColorCell) this.pane.getComponent(i);
Color color = i < size ? colors[size - i - 1] : UsedColorPane.DEFAULT_COLOR; Color color = i <= size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR;
cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color); cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color);
} }
} }

Loading…
Cancel
Save