Browse Source

Pull request #7167: REPORT-64262 【视觉验收】主题编辑的边框配置完善

Merge in DESIGN/design from ~STARRYI/design:REPORT-62689/feature/x to feature/x

* commit '977e23dbc5278f317659d57b11933cf62f68b9eb':
  REPORT-64262 【视觉验收】主题编辑的边框配置完善
feature/x
starryi 3 years ago
parent
commit
ce8baa1732
  1. 6
      designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java
  2. 13
      designer-realize/src/main/java/com/fr/design/report/ReportStylePane.java

6
designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java

@ -117,8 +117,10 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
previewArea = new CellRectangleStylePreviewPane(true); previewArea = new CellRectangleStylePreviewPane(true);
previewArea.setPreferredSize(new Dimension(223, 60)); previewArea.setPreferredSize(new Dimension(215, 52));
previewPane.setBorder(BorderUtils.createTitleBorder(i18nText("Fine-Design_Basic_Preview"))); previewPane.setBorder(BorderFactory.createCompoundBorder(
BorderUtils.createTitleBorder(i18nText("Fine-Design_Basic_Preview")),
BorderFactory.createEmptyBorder(4, 4, 4, 4)));
previewPane.add(previewArea, BorderLayout.CENTER); previewPane.add(previewArea, BorderLayout.CENTER);
this.add(previewPane, BorderLayout.NORTH); this.add(previewPane, BorderLayout.NORTH);

13
designer-realize/src/main/java/com/fr/design/report/ReportStylePane.java

@ -118,13 +118,12 @@ public class ReportStylePane extends BasicPane {
private JPanel createPreviewPane() { private JPanel createPreviewPane() {
JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
container.setBorder(createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"))); container.setBorder(BorderFactory.createCompoundBorder(
container.setPreferredSize(new Dimension(container.getPreferredSize().width, 60)); createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Preview")),
JPanel content = FRGUIPaneFactory.createBorderLayout_S_Pane(); BorderFactory.createEmptyBorder(4, 4, 4, 4)
content.setBorder(BorderFactory.createEmptyBorder(4, 4, 2, 2)); ));
previewArea.setPreferredSize(new Dimension(container.getPreferredSize().width, 42)); previewArea.setPreferredSize(new Dimension(container.getPreferredSize().width, 40));
content.add(previewArea, BorderLayout.NORTH); container.add(previewArea, BorderLayout.CENTER);
container.add(content, BorderLayout.NORTH);
return container; return container;
} }

Loading…
Cancel
Save