Browse Source

REPORT-59908 && REPORT-59906 && REPORT-59907

research/11.0
kerry 3 years ago
parent
commit
0757ed358e
  1. 1
      designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
  2. 7
      designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
  3. 3
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

1
designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java

@ -887,6 +887,7 @@ public class XWFitLayout extends XLayoutContainer {
isRefreshing = true; isRefreshing = true;
this.remove(oldCreator); this.remove(oldCreator);
this.add(newCreator); this.add(newCreator);
this.updateBoundsWidget();
isRefreshing = false; isRefreshing = false;
LayoutUtils.layoutContainer(this); LayoutUtils.layoutContainer(this);
} }

7
designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java

@ -362,7 +362,6 @@ public class ComponentTree extends JTree {
@Override @Override
public void mouseMoved(MouseEvent e) { public void mouseMoved(MouseEvent e) {
Point p = e.getPoint(); Point p = e.getPoint();
int selRow = tree.getRowForLocation(p.x, p.y); int selRow = tree.getRowForLocation(p.x, p.y);
TreeCellRenderer r = tree.getCellRenderer(); TreeCellRenderer r = tree.getCellRenderer();
@ -371,12 +370,12 @@ public class ComponentTree extends JTree {
Point point = tree.getPathBounds(path).getLocation(); Point point = tree.getPathBounds(path).getLocation();
SwingUtilities.convertPointToScreen(point, tree); SwingUtilities.convertPointToScreen(point, tree);
XCreator comp = (XCreator) path.getLastPathComponent(); XCreator comp = (XCreator) path.getLastPathComponent();
if (comp.getXCreatorBaseOperate().supportSelected()){ if (comp.getXCreatorBaseOperate().supportSelected()) {
popupPreviewPane(point.y, comp); popupPreviewPane(point.y, comp);
return;
} }
} else {
hidePreviewPane();
} }
hidePreviewPane();
} }
@Override @Override

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

@ -1317,9 +1317,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
protected void setToolbarButtons() { protected void setToolbarButtons() {
//自适应布局和底层都不能删除
DesignerContext.getDesignerFrame().checkCombineUp(!isRootSelected(), NAME_ARRAY_LIST);
if (isParameterSelected()) { if (isParameterSelected()) {
DesignerContext.getDesignerFrame().checkCombineUp(false, PARAMETER_TOOLAR_BAN_LIST); DesignerContext.getDesignerFrame().checkCombineUp(false, PARAMETER_TOOLAR_BAN_LIST);
} }

Loading…
Cancel
Save