[BUG] Fix cancel revert with copy and copySortSource#529
Open
PhilBroadbent wants to merge 1 commit intobevacqua:masterfrom
Open
[BUG] Fix cancel revert with copy and copySortSource#529PhilBroadbent wants to merge 1 commit intobevacqua:masterfrom
PhilBroadbent wants to merge 1 commit intobevacqua:masterfrom
Conversation
d483ddd to
fa2e327
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR is to fix a bug relating to calling
drake.cancel(true)when usingcopy: trueandcopySortSource: trueWhen
copyis false, moving an item within a container and callingcancelwithrevert: truecorrect returns the dragged element to the correct position. However, whencopyis true (and thus we must also setcopySortSource: trueelse we cannot reorder items in the source container), callingcancel(true)does not return the element to it's original position but instead removes the element.The fix is to check whether the
parentis the same as thesourcecontainer - if it is, do not remove the element and instead useinsertBefore(same as withcopy: false), and if it is not, then the element can be safely removed.