Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions engine/src/base/Project.js
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,8 @@ orderDynamicFrames() {
});
});

// Switch to cursor tool so we can interact with the selection
this.activeTool = 'cursor';
this.selection.selectMultipleObjects(objectsToAdd);
}

Expand Down
2 changes: 1 addition & 1 deletion engine/src/tools/PathCursor.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ Wick.Tools.PathCursor = class extends Wick.Tool {
if (targetItem && targetItem.parent.className === 'CompoundPath') {
targetItem = targetItem.parent;
}
if (this._getWickUUID(targetItem) !== this._getWickUUID(this.detailedEditing)) {
if (this._getWickUUID(targetItem) !== this._getWickUUID(this.detailedEditing) || !targetItem.fullySelected) {
// Hits an item, but not the one currently in detail edit - handle as a click with no hit.
return new this.paper.HitResult();
}
Expand Down
3 changes: 3 additions & 0 deletions engine/src/view/View.Path.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ Wick.View.Path = class extends Wick.View {
}

this.importJSON(this.model.json);
if(!(this.model.project && this.model.project._activeTool && this.model.project._activeTool.name === 'pathcursor')) {
this.item.fullySelected = false;
}

// Apply onion skin style if Needed
// (This is done here in the Path code because we actually change the style of the path
Expand Down