rename to hColorbarMoveTitle

Author: archmoj

src/components/colorbar/draw.js

@@ -651,21 +651,22 @@ function drawColorBar(g, opts, gd) {
             ypad
         ) * 2 + innerThickness + borderwidth + outlinewidth / 2;
 
-        var gapTitleHColorbar = 0;
+        var hColorbarMoveTitle = 0;
         if(!isVertical && title.text && optsY <= 0) {
-            gapTitleHColorbar = outerThickness / 2;
+            hColorbarMoveTitle = outerThickness / 2;
 
-            outerThickness += gapTitleHColorbar;
-            moveY += gapTitleHColorbar;
+            outerThickness += hColorbarMoveTitle;
+            moveY += hColorbarMoveTitle;
         }
-        gd._fullLayout._gapTitleHColorbar = gapTitleHColorbar;
+        fullLayout._hColorbarMoveTitle = hColorbarMoveTitle;
+        fullLayout._hColorbarMoveCBTitle = moveY;
 
         var extraW = borderwidth + outlinewidth;
 
         g.select('.' + cn.cbbg)
         .attr('x', (isVertical ? uPx : vPx) - extraW / 2 - (isVertical ? xpad : 0))
-        .attr('y', (isVertical ? vPx : uPx) - (isVertical ? lenPx : ypad + moveY - gapTitleHColorbar))
-        .attr(isVertical ? 'width' : 'height', Math.max(outerThickness - gapTitleHColorbar, 2))
+        .attr('y', (isVertical ? vPx : uPx) - (isVertical ? lenPx : ypad + moveY - hColorbarMoveTitle))
+        .attr(isVertical ? 'width' : 'height', Math.max(outerThickness - hColorbarMoveTitle, 2))
         .attr(isVertical ? 'height' : 'width', Math.max(lenPx + extraW, 2))
         .call(Color.fill, opts.bgcolor)
         .call(Color.stroke, opts.bordercolor)

src/components/titles/index.js

@@ -96,10 +96,10 @@ function draw(gd, titleClass, options) {
 
     var elShouldExist = txt || editable;
 
-    var gapTitleHColorbar;
+    var hColorbarMoveTitle;
     if(!group) {
         group = Lib.ensureSingle(fullLayout._infolayer, 'g', 'g-' + titleClass);
-        gapTitleHColorbar = fullLayout._gapTitleHColorbar;
+        hColorbarMoveTitle = fullLayout._hColorbarMoveTitle;
     }
 
     var el = group.selectAll('text')
@@ -123,7 +123,7 @@ function draw(gd, titleClass, options) {
     function drawTitle(titleEl) {
         var transformVal;
 
-        if(!transform && gapTitleHColorbar) {
+        if(!transform && hColorbarMoveTitle) {
             transform = {};
         }
 
@@ -132,8 +132,8 @@ function draw(gd, titleClass, options) {
             if(transform.rotate) {
                 transformVal += 'rotate(' + [transform.rotate, attributes.x, attributes.y] + ')';
             }
-            if(transform.offset || gapTitleHColorbar) {
-                transformVal += strTranslate(0, (transform.offset || 0) - (gapTitleHColorbar || 0));
+            if(transform.offset || hColorbarMoveTitle) {
+                transformVal += strTranslate(0, (transform.offset || 0) - (hColorbarMoveTitle || 0));
             }
         } else {
             transformVal = null;