aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaracen2016-03-17 23:10:09 +0000
committerRémi Verschelde2016-04-02 22:12:02 +0200
commitca1ca6c7df00918db594c0ca95fd1b8bcaa58ac4 (patch)
tree0c6cff2085ad4da883d06c14aa0794976f9da99c
parent1369b38d85b7669674eca450ae6933fed2caf277 (diff)
downloadgodot-ca1ca6c7df00918db594c0ca95fd1b8bcaa58ac4.tar.gz
godot-ca1ca6c7df00918db594c0ca95fd1b8bcaa58ac4.tar.zst
godot-ca1ca6c7df00918db594c0ca95fd1b8bcaa58ac4.zip
Fix cursor getting locked on tree control if tree is cleared while modifying numerical element.
(cherry picked from commit 44fe74bfc3df6ac8251ebc4b678c99a7ad122dbb)
-rw-r--r--scene/gui/tree.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index f793bbe3c..554fd932d 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -2743,6 +2743,15 @@ void Tree::clear() {
ERR_FAIL_COND(blocked>0);
}
+ if (pressing_for_editor) {
+ if (range_drag_enabled) {
+ range_drag_enabled = false;
+ Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
+ warp_mouse(range_drag_capture_pos);
+ }
+ pressing_for_editor = false;
+ }
+
if (root) {
memdelete( root );
root = NULL;
@@ -2752,7 +2761,6 @@ void Tree::clear() {
edited_item=NULL;
popup_edited_item=NULL;
selected_item=NULL;
- pressing_for_editor=false;
update();
};