From d00463cf18e56e33c9ed29f03d2f4ac0d87a853b Mon Sep 17 00:00:00 2001
From: "Hugh.C" <Hugh.C@fanruan.com>
Date: Wed, 28 Aug 2019 14:24:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-21203=20=E3=80=90=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=E5=AF=86=E5=BA=A6=E3=80=91=E6=B0=B4=E5=8D=B0=E5=AF=86=E5=BA=A6?=
 =?UTF-8?q?=E6=A1=86=E8=BE=93=E5=85=A5=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?--=EF=BC=8C=E8=BE=93=E5=85=A5=E5=B0=8F=E6=95=B0=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E8=AE=A9=E5=85=81=E8=AE=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/ispinner/UnsignedIntUISpinner.java    | 33 +++++++++++++++++++
 .../com/fr/design/report/WatermarkPane.java   |  5 +--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java

diff --git a/designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java b/designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java
new file mode 100644
index 000000000..00bdcacdf
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java
@@ -0,0 +1,33 @@
+package com.fr.design.gui.ispinner;
+
+import com.fr.design.event.GlobalNameObserver;
+import com.fr.design.event.UIObserver;
+import com.fr.design.gui.itextfield.UIIntNumberField;
+import com.fr.design.gui.itextfield.UINumberField;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Author : Hugh.C
+ * Date: 19-08-28
+ * Time: 下午2:19
+ */
+public class UnsignedIntUISpinner extends UISpinner implements UIObserver, GlobalNameObserver {
+
+
+    public UnsignedIntUISpinner(double minValue, double maxValue, double dierta) {
+        super(minValue, maxValue, dierta);
+    }
+
+    public UnsignedIntUISpinner(double minValue, double maxValue, double dierta, double defaultValue) {
+        super(minValue, maxValue, dierta, defaultValue);
+    }
+
+    @Override
+    protected UINumberField initNumberField() {
+        return new UIIntNumberField() {
+            public boolean shouldResponseChangeListener() {
+                return false;
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
index e190d4038..40fe942d2 100644
--- a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
+++ b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
@@ -7,6 +7,7 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.UnsignedIntUISpinner;
 import com.fr.design.gui.style.FRFontPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@@ -112,8 +113,8 @@ public class WatermarkPane extends BasicPane {
         formulaPane = new TinyFormulaPane();
         fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
         fontSizeComboBox.setEditable(true);
-        horizontalGapSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 200);
-        verticalGapSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 100);
+        horizontalGapSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, 200);
+        verticalGapSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, 100);
         horizontalGapSpinner.setPreferredSize(SPINNER_DIMENSION);
         verticalGapSpinner.setPreferredSize(SPINNER_DIMENSION);
         JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));

From fce2663ab67ff4dc2b125148be0e740ac431fbe5 Mon Sep 17 00:00:00 2001
From: "Hugh.C" <Hugh.C@fanruan.com>
Date: Wed, 28 Aug 2019 14:27:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-21203=20=E5=8E=BB=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=AE=9E=E7=8E=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java b/designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java
index 00bdcacdf..0a04eabf5 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java
@@ -1,7 +1,5 @@
 package com.fr.design.gui.ispinner;
 
-import com.fr.design.event.GlobalNameObserver;
-import com.fr.design.event.UIObserver;
 import com.fr.design.gui.itextfield.UIIntNumberField;
 import com.fr.design.gui.itextfield.UINumberField;
 
@@ -11,7 +9,7 @@ import com.fr.design.gui.itextfield.UINumberField;
  * Date: 19-08-28
  * Time: 下午2:19
  */
-public class UnsignedIntUISpinner extends UISpinner implements UIObserver, GlobalNameObserver {
+public class UnsignedIntUISpinner extends UISpinner {
 
 
     public UnsignedIntUISpinner(double minValue, double maxValue, double dierta) {