Browse Source

Merge pull request #1598 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit 'ba8f80f452a82a086c6d713882dea1fcfef91242':
  REPORT-6270 & REPORT-6443 参数面板里的相关bug(问题2、3);控件树消失问题
superman 7 years ago
parent
commit
e2de0b4eb1
  1. 1
      designer_form/src/com/fr/design/mainframe/ComponentTree.java
  2. 2
      designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
  3. 3
      designer_form/src/com/fr/design/mainframe/JForm.java

1
designer_form/src/com/fr/design/mainframe/ComponentTree.java

@ -52,6 +52,7 @@ public class ComponentTree extends JTree {
}
private void initListeners() {
this.addTreeSelectionListener(designer);
ComponetTreeMouseListener componetTreeMouseListener = new ComponetTreeMouseListener(this);
this.addMouseMotionListener(componetTreeMouseListener);
this.addMouseListener(componetTreeMouseListener);

2
designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java

@ -111,8 +111,6 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
// 这里要刷新一下,否则控件树中没有任何一个控件处于选中状态
refreshComponentTree();
// 初始刷新完成后,再加 listener
componentTree.addTreeSelectionListener(formDesigner);
}
private void refreshComponentTree() {

3
designer_form/src/com/fr/design/mainframe/JForm.java

@ -248,6 +248,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
@Override
public void fireCreatorModified(DesignerEvent evt) {
if (formDesign.getArea() == null || !formDesign.getArea().isValid()) {
return;
}
if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED) {
setPropertyPaneChange(formDesign.getRootComponent());
} else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {

Loading…
Cancel
Save