Browse Source

Pull request #2356: REPORT-40028 在UI类的paint方法中已经进行了顶层组件的绘制,就不将其加入FormDesigner了

Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0

* commit '80052d7b9668e467c2fcd612a0ba7200bcc1b4fd':
  REPORT-40028 在UI类的paint方法中已经进行了顶层组件的绘制,就不将其加入FormDesigner了
feature/big-screen
Yuan.Wang 4 years ago
parent
commit
e3e06a661e
  1. 1
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
  2. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

1
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@ -189,7 +189,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
this.switchAction = switchAction; this.switchAction = switchAction;
topXCreators=new TopXCreators(this); topXCreators=new TopXCreators(this);
topXCreators.setVisible(true); topXCreators.setVisible(true);
add(topXCreators);
// 必须刷新"参数/控件树"面板,否则,若最近一次打开模版为 cpt,重启设计器,打开 frm,控件树消失 // 必须刷新"参数/控件树"面板,否则,若最近一次打开模版为 cpt,重启设计器,打开 frm,控件树消失
populateParameterPropertyPane(); populateParameterPropertyPane();

4
designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

@ -84,7 +84,7 @@ public class FormDesignerUI extends ComponentUI {
// 设计参数面板 // 设计参数面板
repaintPara(g, paraComponent, c); repaintPara(g, paraComponent, c);
} }
repaintTopXCreators(g); paintTopXCreators(g);
if (designer.isDrawLineMode() && designer.getDrawLineHelper().drawLining()) { if (designer.isDrawLineMode() && designer.getDrawLineHelper().drawLining()) {
designer.getDrawLineHelper().drawAuxiliaryLine(g); designer.getDrawLineHelper().drawAuxiliaryLine(g);
@ -446,7 +446,7 @@ public class FormDesignerUI extends ComponentUI {
ComponentUtils.resetBuffer(dbcomponents); ComponentUtils.resetBuffer(dbcomponents);
} }
private void repaintTopXCreators(Graphics g){ private void paintTopXCreators(Graphics g){
designer.paintTopCreators(g); designer.paintTopCreators(g);
} }

Loading…
Cancel
Save