Honour the scrollbar margin

Author: n-riesco

src/components/legend/draw.js

@@ -307,21 +307,26 @@ module.exports = function draw(gd) {
         return;
 
         function positionScrollBar(legendHeight) {
+            // increase the background and clip-path width
+            // by the scrollbar width and margin
             bg.attr({
                 width: opts.width -
                     2 * opts.borderwidth +
-                    constants.scrollBarWidth
+                    constants.scrollBarWidth +
+                    constants.scrollBarMargin
             });
 
             clipPath.select('rect').attr({
-                width: opts.width + constants.scrollBarWidth
+                width: opts.width +
+                    constants.scrollBarWidth +
+                    constants.scrollBarMargin
             });
 
             if(gd.firstRender) {
                 // Move scrollbar to starting position
                 scrollBar.call(
                     Drawing.setRect,
-                    opts.width - constants.scrollBarMargin,
+                    opts.width,
                     constants.scrollBarMargin,
                     constants.scrollBarWidth,
                     constants.scrollBarHeight
@@ -373,7 +378,7 @@ module.exports = function draw(gd) {
                 scrollBox.attr('transform', 'translate(0, ' + scrollBoxY + ')');
                 scrollBar.call(
                     Drawing.setRect,
-                    opts.width - constants.scrollBarMargin,
+                    opts.width,
                     scrollBarY,
                     constants.scrollBarWidth,
                     constants.scrollBarHeight