From 1ac33db0c254d05ec7a3381a714c89d8677cdf11 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Mon, 7 Nov 2016 19:29:49 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-750=20=E8=A1=A8=E5=8D=95=E5=85=B1?=
 =?UTF-8?q?=E5=88=9B=E5=86=85=E6=B5=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/creator/XWAbsoluteBodyLayout.java  | 10 ++++++++++
 .../src/com/fr/design/mainframe/FormArea.java          |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java
index b9fea0a0b..e4008df6f 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java
@@ -42,4 +42,14 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
     public void setEditable(boolean isEditable) {
         super.setEditable(true);
     }
+
+    /**
+     * 该组件是否可以拖拽(表单中绝对布局不可以拖拽)
+     *
+     * @return 是则返回true
+     */
+    @Override
+    public boolean isSupportDrag() {
+        return false;
+    }
 }
diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java
index 26f3b0490..4f6c86fee 100644
--- a/designer_form/src/com/fr/design/mainframe/FormArea.java
+++ b/designer_form/src/com/fr/design/mainframe/FormArea.java
@@ -433,17 +433,17 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         if (rec.width <= dWidth&&rec.x < getHorizontalValue()) {
         	//在边界内部且x位置小于水平滚动条的值
         	horScrollBar.setValue(rec.x);
-        } else if (rec.x+rec.width > dWidth) {
+        } else if (rec.x + rec.width > dWidth + horizontalValue) {
         	//超出边界宽度
-        	horScrollBar.setValue(rec.x+rec.width-dWidth);
+        	horScrollBar.setValue(rec.x + rec.width - dWidth);
         }
         int dHeight = getDesignerHeight();
         if (rec.height < dHeight && rec.y < getVerticalValue()) {
         	//在边界内部且y位置小于竖直滚动条的值
         	 verScrollBar.setValue(rec.y);
-        } else if (rec.y+rec.height > dHeight) {
+        } else if (rec.y + rec.height > dHeight + verticalValue) {
         	//超出边界高度
-        	verScrollBar.setValue(rec.y+rec.height-dHeight);
+        	verScrollBar.setValue(rec.y + rec.height - dHeight);
         }
     }