Browse Source

Merge pull request #317 in BA/design from ~ZACK/design:dev to dev

* commit '0fcfdc75cd933e972cf0481b3504ec44786af284':
  bug104400,自适应布局拖动的时候一个间隔漏掉了
master
superman 8 years ago
parent
commit
e71c307016
  1. 2
      designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java

2
designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java

@ -927,7 +927,7 @@ public class FRBodyLayoutAdapter extends AbstractLayoutAdapter{
minRightW = getMinRightWidth(cX, 0, y); minRightW = getMinRightWidth(cX, 0, y);
if (cX - DEFAULT_AREA_LENGTH > margin.getLeft()) { if (cX - DEFAULT_AREA_LENGTH > margin.getLeft()) {
Component targetRightComp = container.getLeftComp(cX, y); Component targetRightComp = container.getLeftComp(cX, y);
minLeftW = getMinLeftWidth(targetRightComp, cX-DEFAULT_AREA_LENGTH); minLeftW = getMinLeftWidth(targetRightComp, cX - DEFAULT_AREA_LENGTH - actualVal);//bug104400没算上间隔
} }
dealTrisectAtRight(child, minLeftW, minRightW); dealTrisectAtRight(child, minLeftW, minRightW);
} }

Loading…
Cancel
Save