From fbfd2dd25946c0a4023a68308f63bc3b2c0b3b4d Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Thu, 23 Nov 2017 15:47:47 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5313=209.0[8.0]=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=8D=95=E5=85=83=E6=A0=BC=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E8=AE=BE=E7=BD=AE=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E9=A2=84=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=86=8D=E5=88=87=E6=8D=A2=E5=9B=9E=E6=9D=A5=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=95=8C=E9=9D=A2=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../background/gradient/GradientBar.java      | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/designer_base/src/com/fr/design/style/background/gradient/GradientBar.java b/designer_base/src/com/fr/design/style/background/gradient/GradientBar.java
index 01894aa065..e9e6d092a9 100644
--- a/designer_base/src/com/fr/design/style/background/gradient/GradientBar.java
+++ b/designer_base/src/com/fr/design/style/background/gradient/GradientBar.java
@@ -180,9 +180,13 @@ public class GradientBar extends JComponent implements UIObserver,ColorSelectabl
         }
         float[] dist = new float[list.size()];
         for (int i = 0; i < list.size(); i++) {
-            dist[i] = (float) ((list.get(i).getX() - 4) / (max - 4));
+            float value = (float) ((list.get(i).getX() - 4) / (max - 4));
+            if (0 <= value && value <= 1) {
+                dist[i] = value;
+            } else {
+                dist[i] = value < 0 ? 0 : 1;
+            }
         }
-        dist = correctDist(dist);
         LinearGradientPaint paint = new LinearGradientPaint(start, end, dist, c);
 
         g2.setPaint(paint);
@@ -194,17 +198,6 @@ public class GradientBar extends JComponent implements UIObserver,ColorSelectabl
         }
     }
 
-    /**
-     * 确保dist在0-1之间
-     */
-    public float[] correctDist(float[] dist){
-        if (dist.length == 2) {
-            dist[0] = dist[0] < 0 ? 0 : dist[0];
-            dist[1] = dist[1] > 1 ? 1 : dist[1];
-        }
-        return dist;
-    }
-
     /**
      * 状态改变
      */