Browse Source

REPORT-64655 【视觉验收】模板主题管理

【问题原因】
修改主题单元格样式编辑中的外边距

【改动思路】
同上
bugfix/11.0
Starryi 3 years ago
parent
commit
7d78a0e66c
  1. 27
      designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java

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

@ -137,9 +137,6 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
protected void initLayout() { protected void initLayout() {
this.setLayout(new BorderLayout(0, 10)); this.setLayout(new BorderLayout(0, 10));
JPanel jPanel = new JPanel();
jPanel.setLayout(new BorderLayout(0, 4));
JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
previewArea = new CellRectangleStylePreviewPane(true); previewArea = new CellRectangleStylePreviewPane(true);
previewArea.setPreferredSize(new Dimension(215, 48)); previewArea.setPreferredSize(new Dimension(215, 48));
@ -150,8 +147,13 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
this.add(previewPane, BorderLayout.NORTH); this.add(previewPane, BorderLayout.NORTH);
this.add(jPanel, BorderLayout.CENTER); JPanel settingsPane = new JPanel();
jPanel.add(tabPane, BorderLayout.NORTH); this.add(settingsPane, BorderLayout.CENTER);
settingsPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
settingsPane.setLayout(new BorderLayout(0, 4));
settingsPane.add(tabPane, BorderLayout.NORTH);
JPanel attrListenerPane = new AbstractAttrNoScrollPane() { JPanel attrListenerPane = new AbstractAttrNoScrollPane() {
@Override @Override
@ -176,18 +178,27 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
fireAttrChangeListener(); fireAttrChangeListener();
} }
}); });
BasicScrollPane basicScrollPane = new AttrScrollPane() { return new EmptyBorderAttrScrollPane() {
@Override @Override
protected JPanel createContentPane() { protected JPanel createContentPane() {
return centerPane; return centerPane;
} }
}; };
return basicScrollPane;
} }
}; };
jPanel.add(attrListenerPane, BorderLayout.CENTER); settingsPane.add(attrListenerPane, BorderLayout.CENTER);
} }
@Override @Override
public void updateBean(ThemedCellStyle ob) {} public void updateBean(ThemedCellStyle ob) {}
private static abstract class EmptyBorderAttrScrollPane extends AttrScrollPane {
@Override
protected void layoutContentPane() {
super.layoutContentPane();
leftcontentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
}
}
} }

Loading…
Cancel
Save