Set the fill opacity instead of just scaling it

git-svn-id: https://flot.googlecode.com/svn/trunk@65 1e0a6537-2640-0410-bfb7-f154510ff394
18 years ago · 9a19740128
parent f28eb70f05
commit 9a19740128
1 changed files with 8 additions and 1 deletions
--- a/jquery.flot.js
+++ b/jquery.flot.js
@ -1297,7 +1297,14 @@
        function setFillStyle(obj, seriesColor) {
            var fill = obj.fill;
            if (fill) {
-                ctx.fillStyle = obj.fillColor ? obj.fillColor : parseColor(seriesColor).scale(null, null, null, typeof fill == "number" ? fill : 0.4).toString();
+                if (obj.fillColor)
+                    ctx.fillStyle = obj.fillColor;
+                else {
+                    var c = parseColor(seriesColor);
+                    c.a = typeof fill == "number" ? fill : 0.4;
+                    c.normalize();
+                    ctx.fillStyle = c.toString();
+                }
            }
            
        }