From 2c2c48ffb3bd381d09d1e0e4389a2b86255fe20f Mon Sep 17 00:00:00 2001
From: Pedro J. Estébanez
Date: Wed, 22 Mar 2017 21:18:47 +0100
Subject: Implement warped mouse panning for 2D & 3D editors Enabled by default
 as in Blender, but can be disabled separately for 2D & 3D; the core
 functionality is in Input so this could be reused or even exposed to scripts
 in the future

---
 editor/plugins/canvas_item_editor_plugin.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'editor/plugins/canvas_item_editor_plugin.cpp')

diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index e7189b0f4..f86f53168 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -1462,8 +1462,15 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
 
 			if ((m.button_mask & BUTTON_MASK_LEFT && tool == TOOL_PAN) || m.button_mask & BUTTON_MASK_MIDDLE || (m.button_mask & BUTTON_MASK_LEFT && Input::get_singleton()->is_key_pressed(KEY_SPACE))) {
 
-				h_scroll->set_val(h_scroll->get_val() - m.relative_x / zoom);
-				v_scroll->set_val(v_scroll->get_val() - m.relative_y / zoom);
+				Point2i relative;
+				if (bool(EditorSettings::get_singleton()->get("2d_editor/warped_mouse_panning"))) {
+					relative = Input::get_singleton()->warp_mouse_motion(m, viewport->get_global_rect());
+				} else {
+					relative = Point2i(m.relative_x, m.relative_y);
+				}
+
+				h_scroll->set_val(h_scroll->get_val() - relative.x / zoom);
+				v_scroll->set_val(v_scroll->get_val() - relative.y / zoom);
 			}
 
 			return;
-- 
cgit v1.2.3-70-g09d2