Filesystem drag & drop moving fixes #12402
Merged
+38
−79
Conversation
This file contains 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
|
After reviewing the mentioned PRs. The changes I made that are overlapping are minor refactoring only, so should be relatively easy to merge. |
|
Needs rebasing after #10261. |
added 2 commits
November 3, 2017 20:49
If a folder would be moved to an invalid location disallow the drag Don't treat dragging a file/folder to its current location as invalid Allow dragging onto empty space / files in the files list Fix dragging a folder onto "Favourites" starting an invalid move
Call push_item before save_resource_as because the save button uses editor_history current. Reject the drop in can_drop_data if it isn't on a folder or the files list. Removed some duplicated code
ghost
force-pushed
the
filesystem-drag-move
branch
from
61a6809 to
078371c
Compare
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.
Fixes to drag & drop functionality regarding dragging items / resources around the filesystem dock.
This used to fail on clicking save with the error:
ERROR: EditorNode::_dialog_action: Condition ' !Object::cast_to<Resource>(current_obj) ' is true. At: editor\editor_node.cpp:1189