fixes accounting for labels in bb and improves compound support re. u…

…pdateCompoundBounds() #1194 #1196
cytoscape · Dec 15, 2015 · 7816705 · 7816705
1 parent 6793546
commit 7816705
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/collection/dimensions.js b/src/collection/dimensions.js
@@ -544,14 +544,12 @@ var boundingBoxImpl = function( ele, options ){
     //////////////////////////
 
     if( styleEnabled && options.includeLabels ){
-
-      updateBounds( getLabelBounds( ele ) );
+      updateBoundsFromBox( bounds, getLabelBounds( ele ) );
 
       if( isEdge ){
-        updateBounds( getLabelBounds( ele, 'source' ) );
-        updateBounds( getLabelBounds( ele, 'target' ) );
+        updateBoundsFromBox( bounds, getLabelBounds( ele, 'source' ) );
+        updateBoundsFromBox( bounds, getLabelBounds( ele, 'target' ) );
       }
-
     } // style enabled for labels
   } // if displayed
 
@@ -594,7 +592,7 @@ elesfn.boundingBox = function( options ){
   var cy_p = eles.cy()._private;
   var styleEnabled = cy_p.styleEnabled;
   if( styleEnabled ){
-    cy_p.renderer.recalculateRenderedStyle( eles.union( eles.parallelEdges() ) );
+    cy_p.renderer.recalculateRenderedStyle( eles.union( eles.parallelEdges() ), !opts.useCache );
   }
 
   for( var i = 0; i < eles.length; i++ ){

diff --git a/src/extensions/renderer/base/coord-ele-math.js b/src/extensions/renderer/base/coord-ele-math.js
@@ -60,7 +60,7 @@ BRp.registerCalculationListeners = function(){
   this.beforeRender( updateEles );
 };
 
-BRp.recalculateRenderedStyle = function( eles ){
+BRp.recalculateRenderedStyle = function( eles, bypassCache ){
   var edges = [];
   var nodes = [];
 
@@ -72,7 +72,7 @@ BRp.recalculateRenderedStyle = function( eles ){
     var id = _p.data.id;
 
     // only update if dirty
-    if( rstyle.clean ){ continue; }
+    if( !bypassCache && rstyle.clean ){ continue; }
 
     if( _p.group === 'nodes' ){
       var pos = _p.position;