Browse Source

Merge pull request #296 in BA/design from ~ZHOUPING/design:release to release

* commit '444446ad051cc1dd874ae238d14a4907cc0c9622':
  绝对布局bug修改3
master
superman 8 years ago
parent
commit
084052d0e9
  1. 4
      designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java

4
designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java

@ -33,6 +33,9 @@ public abstract class AccessDirection implements Direction {
protected int[] sorption(int x, int y,Rectangle current_bounds, FormDesigner designer) {
// 自适应布局不需要吸附线,但需要对齐线,对齐线后面处理
if (!designer.hasWAbsoluteLayout()) {
designer.getStateModel().setEquidistantLine(null);
designer.getStateModel().setXAbsorptionline(null);
designer.getStateModel().setYAbsorptionline(null);
return new int[] { x, y };
} else {
int posy = current_bounds.y;
@ -111,6 +114,7 @@ public abstract class AccessDirection implements Direction {
designer.getStateModel().setXAbsorptionline(findInX && current_bounds.getWidth() > MoveUtils.SORPTION_UNIT ? Absorptionline.createXAbsorptionline(point.x) : null);
designer.getStateModel().setYAbsorptionline(findInY && current_bounds.getHeight() > MoveUtils.SORPTION_UNIT ? Absorptionline.createYAbsorptionline(point.y) : null);
designer.getStateModel().setEquidistantLine(null);
}
private Rectangle getWidgetRelativeBounds(Rectangle bounds, FormSelection selection){

Loading…
Cancel
Save