updatemenus: Fix image test failure

n-riesco · n-riesco · commit 66e503ca5b26 · 2017-01-26T14:37:53.000Z
* Reduce scroll box minimum size from 44 to 25 pixels.

* Allow scroll boxes to use the full width and height.
diff --git a/src/components/updatemenus/draw.js b/src/components/updatemenus/draw.js
@@ -308,7 +308,7 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 
         button.on('click', function() {
             // skip `dragend` events
-            if (d3.event.defaultPrevented) return;
+            if(d3.event.defaultPrevented) return;
 
             setActive(gd, menuOpts, buttonOpts, gHeader, gButton, buttonIndex);
 
diff --git a/src/components/updatemenus/scrollbox.js b/src/components/updatemenus/scrollbox.js
@@ -52,22 +52,24 @@ ScrollBox.barColor = '#808BA4';
 ScrollBox.prototype.enable = function enable() {
     var fullLayout = this.gd._fullLayout,
         fullWidth = fullLayout.width,
-        fullHeight = fullLayout.height,
-        graphSize = fullLayout._size;
+        fullHeight = fullLayout.height;
 
     // compute position of scroll box
     var l = this.position.l,
         w = this.position.w,
         t = this.position.t,
         h = this.position.h,
-        boxW = (w <= fullWidth) ? w : fullWidth - graphSize.r - l,
-        boxH = (h <= fullHeight) ? h : fullHeight - graphSize.b - t,
+        boxW = w,
+        boxH = h,
         boxL, boxR,
         boxT, boxB;
 
-    var minSize = 2 * (ScrollBox.barLength + 2 * ScrollBox.barPad);
-    if(boxW <= minSize || fullWidth < boxW) boxW = fullWidth / 4;
-    if(boxH <= minSize || fullHeight < boxH) boxH = fullHeight / 4;
+    if(boxW > fullWidth) boxW = fullWidth / 4;
+    if(boxH > fullHeight) boxH = fullHeight / 4;
+
+    var minSize = 4 + (ScrollBox.barLength + 2 * ScrollBox.barPad);
+    boxW = Math.max(boxW, minSize);
+    boxH = Math.max(boxH, minSize);
 
     if(0 <= l && l <= fullWidth) {
         boxL = l;
