Browse Source

Merge pull request #1170 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '095722e69549d6e424263bd37871bf4acd46473d':
  REPORT-3933 [9.0一轮回归]显示条形码的文本勾选异常
master
superman 7 years ago
parent
commit
c5d90ad7cf
  1. 6
      designer/src/com/fr/design/present/BarCodePane.java

6
designer/src/com/fr/design/present/BarCodePane.java

@ -145,11 +145,13 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
barHeightContainer.add(barHeightSpinner); barHeightContainer.add(barHeightSpinner);
UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), UILabel.RIGHT); UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), UILabel.RIGHT);
uiLabel.setPreferredSize(typeSetLabel.getPreferredSize()); uiLabel.setPreferredSize(typeSetLabel.getPreferredSize());
JPanel drawingTextCheckBoxPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
drawingTextCheckBox.setBorder(UIConstants.CELL_ATTR_ZEROBORDER); drawingTextCheckBox.setBorder(UIConstants.CELL_ATTR_ZEROBORDER);
drawingTextCheckBoxPane.add(drawingTextCheckBox);
Component[][] components_normal = new Component[][]{ Component[][] components_normal = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Barcode_Size"), UILabel.LEFT), barWidthContainer, barHeightContainer}, new Component[]{new UILabel(Inter.getLocText("FR-Designer_Barcode_Size"), UILabel.LEFT), barWidthContainer, barHeightContainer},
new Component[]{null, new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), UILabel.CENTER), new UILabel(Inter.getLocText("FR-Designer_Height"), UILabel.CENTER)}, new Component[]{null, new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), UILabel.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), UILabel.CENTER)},
new Component[]{drawingTextCheckBox, null, null} new Component[]{drawingTextCheckBoxPane, null, null}
}; };

Loading…
Cancel
Save