diff options
| author | MillionOstrich <31486600+MillionOstrich@users.noreply.github.com> | 2017-10-25 15:27:35 +0100 |
|---|---|---|
| committer | MillionOstrich <31486600+MillionOstrich@users.noreply.github.com> | 2017-11-03 20:49:36 +0000 |
| commit | 9c65924b3db7c61da2045f0ea14e56fdde71e628 (patch) | |
| tree | 02caadf8e402f4ad04b8d786e4b2802c7027004f /editor/filesystem_dock.h | |
| parent | acd193b62e3972d6dd1e4b2aa115948658f85e9b (diff) | |
| download | redot-engine-9c65924b3db7c61da2045f0ea14e56fdde71e628.tar.gz | |
Don't try to move if dragging a folder into itself
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
Diffstat (limited to 'editor/filesystem_dock.h')
| -rw-r--r-- | editor/filesystem_dock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 2cb0573a3d..249621564d 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -209,6 +209,7 @@ private: Variant get_drag_data_fw(const Point2 &p_point, Control *p_from); bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); + String _get_drag_target_folder(const Point2 &p_point, Control *p_from) const; void _preview_invalidated(const String &p_path); void _thumbnail_done(const String &p_path, const Ref<Texture> &p_preview, const Variant &p_udata); |