Browse Source

Merge pull request #255 in BA/design from ~ZHOUPING/design:dev to dev

* commit 'c2187ec556df112cd55eb79bf4ef5ab2f68fb152':
  封代码,绝对布局的等距线屏蔽掉参数面板
master
superman 8 years ago
parent
commit
adaabb5817
  1. 12
      designer_base/src/com/fr/design/beans/location/MoveUtils.java

12
designer_base/src/com/fr/design/beans/location/MoveUtils.java

@ -300,11 +300,13 @@ public class MoveUtils {
findX(px, bounds, left, right, width);
findY(py, bounds, top, bottom, height);
if(isIntersects && !isParameterLayout){
isWidgetsIntersects = true;
}
else{
findEquidistantLine(bounds, left, top, height, width);
if(!isParameterLayout){
if(isIntersects) {
isWidgetsIntersects = true;
}
else{
findEquidistantLine(bounds, left, top, height, width);
}
}
}
showForbiddenWindow(designer, x, y, isWidgetsIntersects);

Loading…
Cancel
Save