Skip to content

Commit

Permalink
No box selection in compound nodes if parent is ungrabified #1995
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkfranz committed Oct 23, 2017
1 parent 1077ddd commit 8533ad2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/extensions/renderer/base/load-listeners.js
Expand Up @@ -752,7 +752,7 @@ BRp.load = function(){
r.hoverData.last = near;
}

if( down && r.nodeIsDraggable( down ) ){
if( down ){

if( isOverThresholdDrag ){ // then we can take action

Expand All @@ -765,7 +765,7 @@ BRp.load = function(){

goIntoBoxMode();

} else { // otherwise drag
} else if( down && down.grabbed() && r.nodeIsDraggable( down ) ){ // drag node
var justStartedDrag = !r.dragData.didDrag;

if( justStartedDrag ){
Expand Down

2 comments on commit 8533ad2

@shean42
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works well, thank you!!

@maxkfranz
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great; thanks

Please sign in to comment.