Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev

8 years ago · e5733e7452
1 changed files with 10 additions and 10 deletions
--- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java
+++ b/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);
        }