Browse Source

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

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

* commit '330343be85654a2249760d4667b08f197985d9c6':
  REPORT-64262 【视觉验收】主题编辑的边框配置完善
feature/x
starryi 3 years ago
parent
commit
9749beda88
  1. 4
      designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
  2. 4
      designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java

4
designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@ -123,7 +123,9 @@ public class CellStylePreviewPane extends JPanel {
Style.paintContent(g2d, paintText, style, width, height, resolution);
Style.paintBorder(g2d, style, width, height);
Style.paintBorder(g2d, style,
width - GraphHelper.getLineStyleSize(style.getBorderRight()) / 2F,
height - GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2F);
}
@Override

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

@ -142,11 +142,11 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
previewArea = new CellRectangleStylePreviewPane(true);
previewArea.setPreferredSize(new Dimension(215, 52));
previewArea.setPreferredSize(new Dimension(215, 48));
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.NORTH);
this.add(previewPane, BorderLayout.NORTH);

Loading…
Cancel
Save