From b90810ce8eec07b4333074c9217a242b129f8d27 Mon Sep 17 00:00:00 2001
From: poke1024 <poke1024@gmx.de>
Date: Wed, 28 Feb 2018 18:51:30 +0100
Subject: [PATCH] Fix grid mesh tile panning bug (issue 16524)

Fix basic function and interference of touch pad pan with mesh tile delete (shift + right click on touch pad) in grid map editor (fix 16524)
---
 modules/gridmap/grid_map_editor_plugin.cpp | 16 +++++++++++++---
 modules/gridmap/grid_map_editor_plugin.h   |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp
index 34d51b51e20..47837a24733 100644
--- a/modules/gridmap/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/grid_map_editor_plugin.cpp
@@ -641,12 +641,21 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 	Ref<InputEventPanGesture> pan_gesture = p_event;
 	if (pan_gesture.is_valid()) {
 
-		if (pan_gesture->get_command() || pan_gesture->get_shift()) {
-			const real_t delta = pan_gesture->get_delta().y;
-			floor->set_value(floor->get_value() + SGN(delta));
+		if (pan_gesture->get_alt() && (pan_gesture->get_command() || pan_gesture->get_shift())) {
+			const real_t delta = pan_gesture->get_delta().y * 0.5;
+			accumulated_floor_delta += delta;
+			int step = 0;
+			if (ABS(accumulated_floor_delta) > 1.0) {
+				step = SGN(accumulated_floor_delta);
+				accumulated_floor_delta -= step;
+			}
+			if (step) {
+				floor->set_value(floor->get_value() + step);
+			}
 			return true;
 		}
 	}
+	accumulated_floor_delta = 0.0;
 
 	return false;
 }
@@ -1247,6 +1256,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 
 	selection.active = false;
 	updating = false;
+	accumulated_floor_delta = 0.0;
 }
 
 GridMapEditor::~GridMapEditor() {
diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h
index 96517705288..f79d9aefa0e 100644
--- a/modules/gridmap/grid_map_editor_plugin.h
+++ b/modules/gridmap/grid_map_editor_plugin.h
@@ -76,6 +76,7 @@ class GridMapEditor : public VBoxContainer {
 	Panel *panel;
 	MenuButton *options;
 	SpinBox *floor;
+	double accumulated_floor_delta;
 	ToolButton *mode_thumbnail;
 	ToolButton *mode_list;
 	HBoxContainer *spatial_editor_hb;