Browse Source

Merge pull request #318 in BA/design from ~ZACK/design:master to master

* commit 'bca32e9cab13e02eac1759e9d9cab6feb9759e87':
  bug104400传master(紧急bug)
master
superman 8 years ago
parent
commit
9b310a25d1
  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);
if (cX - DEFAULT_AREA_LENGTH > margin.getLeft()) {
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);
}

Loading…
Cancel
Save