diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-01 15:29:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 15:29:35 +0200 |
| commit | cb4635f260836d28404ed2e80325a6fa44e55216 (patch) | |
| tree | 353ded36734da01c95f6e6ad393cbe5086575078 | |
| parent | af3ee1c860034af855c4e9899e63380fa9dc1f8f (diff) | |
| parent | d202cf68992c9dd1218133cf887731cdb2475d64 (diff) | |
Merge pull request #49241 from floppyhammer/fix-tree-item-dragging
Make tree item dragging not affected by touch dragging
| -rw-r--r-- | scene/gui/tree.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index d2b98eb0fa..50e7ba97bc 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -3106,7 +3106,7 @@ void Tree::_gui_input(Ref<InputEvent> p_event) { drag_accum = 0; //last_drag_accum=0; drag_from = v_scroll->get_value(); - drag_touching = !DisplayServer::get_singleton()->screen_is_touchscreen(DisplayServer::get_singleton()->window_get_current_screen(get_viewport()->get_window_id())); + drag_touching = DisplayServer::get_singleton()->screen_is_touchscreen(DisplayServer::get_singleton()->window_get_current_screen(get_viewport()->get_window_id())); drag_touching_deaccel = false; if (drag_touching) { set_physics_process_internal(true); |