summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-01-02 14:38:25 +0100
committerGitHub <noreply@github.com>2017-01-02 14:38:25 +0100
commitf50afe81d83dee7b2d64e14c68b300de4dd1062b (patch)
tree484e077fd351a699e917b635863b14b3a97c9eed /scene
parent3e1b5ad2237053e94c1b2d12798630d2157c9ac8 (diff)
parentd40eb1565ed5a9cae29fa83561b42566119b2b7d (diff)
Merge pull request #7385 from bojidar-bg/tree-range-drag-lock
Fix #7098 by not accepting right clicks while dragging the range
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/tree.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 2b9904229e..8a1a82dd00 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -2414,6 +2414,9 @@ void Tree::_input_event(InputEvent p_event) {
}
+ if (range_drag_enabled)
+ break;
+
switch(b.button_index) {
case BUTTON_RIGHT:
case BUTTON_LEFT: {