Browse Source

Merge pull request #5803 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '07f9dae7c68f04d5d6cce20f4d9703b7375e6252':
  REPORT-58991 设计器内-模板画布可滚动-点击组件编辑-不在视线内的组件,编辑锁定位置有问题
bugfix/10.0
superman 3 years ago
parent
commit
873a5dfa90
  1. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

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

@ -787,7 +787,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
int formDesignerWidth = designer.getWidth();
int formDesignerHeight = designer.getHeight();
// 不超过可绘制区域
int extraX = Math.min(creatorRightX, formDesignerWidth);
int extraX = creatorRightX < 0 ? 0 : Math.min(creatorRightX, formDesignerWidth);
int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight);
if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) {

Loading…
Cancel
Save