|
|
|
@ -380,9 +380,9 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
|
|
|
|
|
Dimension d = new Dimension(layout.getWidth(), layout.getHeight()); |
|
|
|
|
XWBorderLayout parent = (XWBorderLayout) layout.getParent(); |
|
|
|
|
root.setScale(scale); |
|
|
|
|
parent.setScale(scale); |
|
|
|
|
// 自适应布局的父层是border
|
|
|
|
|
if (layout.getParent() != null) { |
|
|
|
|
if (parent != null) { |
|
|
|
|
parent.setScale(scale); |
|
|
|
|
int paraHeight = parent.toData().getNorthSize(); |
|
|
|
|
XLayoutContainer paraComponent = designer.getParaComponent(); |
|
|
|
|
if (needCalculateParaHeight && paraComponent != null) { |
|
|
|
@ -395,7 +395,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
|
|
|
|
|
parent.add(root, WBorderLayout.CENTER); |
|
|
|
|
root.setBounds(0, this.designer.getParaHeight(), d.width, d.height); |
|
|
|
|
} |
|
|
|
|
layout.getParent().setSize(d.width, d.height + this.designer.getParaHeight()); |
|
|
|
|
parent.setSize(d.width, d.height + this.designer.getParaHeight()); |
|
|
|
|
|
|
|
|
|
// 调整自适应布局大小后,同步调整参数界面和border大小,此时刷新下formArea
|
|
|
|
|
FormArea.this.validate(); |
|
|
|
|