Browse Source

Pull request #14891: REPORT-135317 - 【fr-fbp回归】组件滑块少了0 & REPORT-135458 - 【fr-fbp回归】模板主题部分tab丢失

Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release

* commit '9b3a7b12c95a8721f09f8cb0a2490924fa33fbc3':
  调整标签生成步长
  拖拽条生成标签步长自定义&控件显示增强tab恢复
fbp/release
Renekton-张世豪 2 months ago
parent
commit
dfd0b4f014
  1. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java

2
designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java

@ -38,7 +38,7 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
public UINumberDragPane(double minValue, double maxValue, double dierta) { public UINumberDragPane(double minValue, double maxValue, double dierta) {
dragBar = new UISlider((int) minValue, (int) maxValue); dragBar = new UISlider((int) minValue, (int) maxValue);
dragBar.setPaintLabels(true); dragBar.setPaintLabels(true);
dragBar.setMajorTickSpacing((int) maxValue - (int) minValue); dragBar.setMajorTickSpacing(minValue < 0 ? (int) maxValue : (int) maxValue - (int) minValue);
spinner = createUISpinner(minValue, maxValue, dierta); spinner = createUISpinner(minValue, maxValue, dierta);
spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")); spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
spinner.setValue(dragBar.getValue()); spinner.setValue(dragBar.getValue());

2
designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java

@ -51,8 +51,8 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), reportBodyStyleSettingPane); addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), reportBodyStyleSettingPane);
addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane()); addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane()); addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
initializePane();
refreshExtraAdvancedPane(); refreshExtraAdvancedPane();
initializePane();
} }
@Override @Override

Loading…
Cancel
Save