From 0fcfdc75cd933e972cf0481b3504ec44786af284 Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 8 Sep 2016 15:56:54 +0800 Subject: [PATCH] =?UTF-8?q?bug104400,=E8=87=AA=E9=80=82=E5=BA=94=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E6=8B=96=E5=8A=A8=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=97=B4=E9=9A=94=E6=BC=8F=E6=8E=89=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/layout/FRBodyLayoutAdapter.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git 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 index b5dbb34855..313c08b02b 100644 --- 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 @@ -911,23 +911,23 @@ public class FRBodyLayoutAdapter extends AbstractLayoutAdapter{ minUpH = getUpMinHeightComp(cY, x); minDownH = getDownMinHeightComp(currentComp, y); dealTrisectAtTop(child, minUpH, minDownH); - } else if(ComparatorUtils.equals(trisectAreaDirect, COMP_BOTTOM)) { - minUpH = getUpMinHeightComp(cY+cH+actualVal, x); - if (cY+cH+DEFAULT_AREA_LENGTH margin.getLeft()) { - Component targetRightComp = container.getLeftComp(cX, y); - minLeftW = getMinLeftWidth(targetRightComp, cX-DEFAULT_AREA_LENGTH); + 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 - actualVal);//bug104400没算上间隔 } dealTrisectAtRight(child, minLeftW, minRightW); }