helps to avoid state overlap for pan/select

NeveHanter · Jan 9, 2015 · 4327f51 · 4327f51
1 parent 4294a16
commit 4327f51
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/extensions/renderer.canvas.drawing-redraw.js b/src/extensions/renderer.canvas.drawing-redraw.js
@@ -452,7 +452,7 @@
 
         setContextTransform( context );
 
-        if (data.select[4] == 1) {
+        if( data.select[4] == 1 && r.hoverData.selecting ){
           var zoom = data.cy.zoom();
           var borderWidth = coreStyle['selection-box-border-width'].value / zoom;
 
@@ -484,7 +484,7 @@
           }
         }
 
-        if( data.bgActivePosistion ){
+        if( data.bgActivePosistion && !r.hoverData.selecting ){
           var zoom = data.cy.zoom();
           var pos = data.bgActivePosistion;