From 5aeaf116985970713264c1c8528632a7dd919606 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Fri, 17 Feb 2017 18:01:28 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1838=20frm=E9=87=8C=E5=A4=9A=E5=B1=82tab?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E8=B0=83=E6=95=B4=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=9D=97=E5=A4=A7=E5=B0=8F=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beans/adapters/layout/FRFitLayoutAdapter.java        | 6 +++++-
 .../beans/adapters/layout/FRTabFitLayoutAdapter.java     | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
index 25b079caf0..d8243a24bb 100644
--- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
+++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
@@ -277,6 +277,10 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
         super.clearCompsList();
     }
 
+    protected Rectangle getLayoutBound(XWCardMainBorderLayout mainLayout){
+        return mainLayout.getBounds();
+    }
+
     private Rectangle adjustBackupBound(Rectangle backupBound, XWCardMainBorderLayout mainLayout) {
         // 参数界面高度对纵坐标产生的影响
         JForm jform = (JForm) (HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
@@ -284,7 +288,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
             backupBound.y -= jform.getFormDesign().getParaHeight();
         }
 
-        Rectangle rec = mainLayout.getBounds();
+        Rectangle rec = getLayoutBound(mainLayout);
         // XWTabLayout里面的横纵坐标收到外层XWCardMainBorderLayout的横纵坐标影响
         // 减掉之后可以按照它原来的逻辑执行
         backupBound.x -= rec.x;
diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java
index 8c67a44ab0..bd85fc83be 100644
--- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java
+++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java
@@ -4,13 +4,12 @@
 package com.fr.design.designer.beans.adapters.layout;
 
 
-import java.awt.Rectangle;
-
 import com.fr.design.beans.GroupModel;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWidgetCreator;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
+import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.designer.properties.FRTabFitLayoutPropertiesGroupModel;
 import com.fr.design.utils.ComponentUtils;
@@ -18,6 +17,8 @@ import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.general.ComparatorUtils;
 
+import java.awt.*;
+
 /**
  * tab布局tabFit适配器
  * 
@@ -91,4 +92,8 @@ public class FRTabFitLayoutAdapter extends FRFitLayoutAdapter {
 		}
 		return y;
     }
+
+	protected Rectangle getLayoutBound(XWCardMainBorderLayout mainLayout){
+		return ComponentUtils.getRelativeBounds(mainLayout);
+	}
 }
\ No newline at end of file