godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dropping file on parrent dirrectory fixed

Browse Source 
(cherry picked from commit 1ac936f035)
This commit is contained in:
Dashcell 2020-09-14 22:57:03 -03:00 committed by Rémi Verschelde
parent a46fd28ae3
commit c43e8d8fbd
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/tree.cpp
View File

@ -1279,8 +1279,9 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
if (drop_mode_flags && drop_mode_over == p_item) { if (drop_mode_flags && drop_mode_over == p_item) {
Rect2 r = cell_rect; Rect2 r = cell_rect;
bool has_parent = p_item->get_children() != nullptr;
if (drop_mode_section == -1 || drop_mode_section == 0) { if (drop_mode_section == -1 || has_parent || drop_mode_section == 0) {
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y, r.size.x, 1), cache.drop_position_color); VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y, r.size.x, 1), cache.drop_position_color);
} }
@ -1289,7 +1290,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x + r.size.x - 1, r.position.y, 1, r.size.y), cache.drop_position_color); VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x + r.size.x - 1, r.position.y, 1, r.size.y), cache.drop_position_color);
} }
if (drop_mode_section == 1 || drop_mode_section == 0) { if ((drop_mode_section == 1 && !has_parent) || drop_mode_section == 0) {
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y + r.size.y, r.size.x, 1), cache.drop_position_color); VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y + r.size.y, r.size.x, 1), cache.drop_position_color);
} }
} }