Browse Source

REPORT-144631 调整AutoChartTypePane combobox缩放

fbp/feature
shengzu.xue 3 months ago
parent
commit
015a323e0c
  1. 8
      designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java

8
designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java

@ -110,9 +110,8 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent
@Override
public Dimension getPreferredSize() {
// 这里大小设计要和TableDataComboBox保持一致,不然两个多选框会有大小差异
int comboWidth = FineUIScale.scale(super.getPreferredSize().width);
int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24);
return new Dimension(comboWidth, comboHeight);
return new Dimension(super.getPreferredSize().width, comboHeight);
}
}
@ -139,18 +138,17 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent
private JPanel createContentPane() {
JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
JPanel tableDataPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
panel.add(tableDataPane);
tableDataPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":"));
tableNameComboBox.setPreferredSize(new Dimension(126, 20));
tableNameComboBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20)));
tableDataPane.add(tableNameComboBox);
JPanel areaNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
panel.add(areaNamePane);
areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":"));
areaNamePane.add(dataFieldBox);
dataFieldBox.setPreferredSize(new Dimension(126, 20));
dataFieldBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20)));
panel.add(refreshButton);
panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
return panel;

Loading…
Cancel
Save