Browse Source

Pull request #5478: REPORT-57647 cpt参数面板中组件被下方覆盖时 工具栏需要不可见

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'f97a0bf7187f88d255697c739c00ee52b05466be':
  REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
zheng-1641779399395
Hades 3 years ago
parent
commit
b1058789ad
  1. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

6
designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@ -783,6 +783,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
// 不超过可绘制区域 // 不超过可绘制区域
int extraX = Math.min(creatorRightX, formDesignerWidth); int extraX = Math.min(creatorRightX, formDesignerWidth);
int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight); int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight);
if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) {
popup.setVisible(false);
return;
}
// 放到事件尾部执行 // 放到事件尾部执行
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override

Loading…
Cancel
Save