fixed text moving down after redraw

Author: Xing

js/config.js

@@ -36,5 +36,6 @@ const Config = {
     attachmentMargin: 0.1,
     word2word_strategy: strategies.FARTHEST,
     word2link_strategy: strategies.CLOSEST, 
-    link2link_strategy: strategies.FARTHEST //CLOSEST sometimes causes overlaps - need to be a bit more rigorous when assigning slots - don't assign any slots that have the potential to overlap (when dragged manually)? - or let the buyer beware that this could happen - they can always move out of the way - right now it won't automatically overlap, but won't prevent a user from doing it. 
+    link2link_strategy: strategies.FARTHEST, //CLOSEST sometimes causes overlaps - need to be a bit more rigorous when assigning slots - don't assign any slots that have the potential to overlap (when dragged manually)? - or let the buyer beware that this could happen - they can always move out of the way - right now it won't automatically overlap, but won't prevent a user from doing it. 
+    redraw: 0
 };

js/render.js

@@ -769,6 +769,7 @@ function redrawLinks(forceRedrawingAll) { //force redraw of all when resizing wi
   Object.keys(linkObjs).forEach(function(key) {
     if (linkObjs[key].needsUpdate || forceRedrawingAll == true) {
       ////console.log(" link #" + key + " needsUpdate");
+      Config.redraw = 1;
       drawLink(linkObjs[key]);
       linkObjs[key].needsUpdate = false;
     }
@@ -1316,6 +1317,7 @@ function calculateEndRow(idx, rowNum, link, percentagePadding, xPositions, linkS
 function calculateLinkLabels(idx, rowNum, x, y, link, isHidden) {
 
   var style;
+  var text;
 
   if (rowNum % 2 == 0) {
     style = styles.labelEvenFill.style;
@@ -1326,12 +1328,20 @@ function calculateLinkLabels(idx, rowNum, x, y, link, isHidden) {
   var twh = link.textWH;
 
   var rect = {x: (x - 2 - twh.w/2), y: (y - link.textStyle.maxHeight/2), w: (twh.w + 4), h: link.textStyle.maxHeight, style:style};
-  var text = {text: link.textStr, x: (x - twh.w/2), y: (y - link.textStyle.maxHeight/2 - link.textStyle.descent), style: (link.textStyle.style), visibility:true};
+
+
+  if (Config.redraw) { 
+    text = {text: link.textStr, x: (x - twh.w/2), y: (y - link.textStyle.maxHeight/2), style: (link.textStyle.style), visibility:true};
+  }
+  else {
+    text = {text: link.textStr, x: (x - twh.w/2), y: (y - link.textStyle.maxHeight/2 - link.textStyle.descent), style: (link.textStyle.style), visibility:true};
+  }
 
   console.log(" in calculateLinkLabels, idx = " + idx + ", rowNum = " + rowNum + ", rect = ");
   console.log(rect);
   console.log(" in calculateLinkLabels, text = ");
   console.log(text);
+  console.log(link.textStyle.descent)
 
   link.labels[idx] = {rect:rect, text:text};
 

js/utils.js

@@ -248,7 +248,7 @@ function getDescentForFont(str, fs) {
   textbbox = t.bbox();
   t.remove();
 
-  ////console.log("in getMaxTextHeightForFont, y = " + textbbox.y + ", y2 = " + textbbox.y2);
+  console.log("in getMaxTextHeightForFont, y = " + textbbox.y + ", y2 = " + textbbox.y2);
   return textbbox.y;
 }