Add the ability to cancel pan/zoom/orbit navigation

Author: ryevdokimov

editor/plugins/node_3d_editor_plugin.cpp

@@ -1740,6 +1740,12 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			} break;
 			case MouseButton::RIGHT: {
 				if (b->is_pressed()) {
+					if(navigating) {
+						navigating = false;
+						cursor = previous_cursor;
+						break;
+					}
+
 					if (_edit.gizmo.is_valid()) {
 						// Restore.
 						_edit.gizmo->commit_handle(_edit.gizmo_handle, _edit.gizmo_handle_secondary, _edit.gizmo_initial_value, true);
@@ -2185,6 +2191,13 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			}
 		}
 
+		if(!navigating && (nav_mode == NAVIGATION_PAN || nav_mode == NAVIGATION_ZOOM || nav_mode == NAVIGATION_ORBIT)) {
+			navigating = true;
+			previous_cursor = cursor;
+		} else if(navigating && (nav_mode == NAVIGATION_NONE || nav_mode == NAVIGATION_LOOK)) {
+			navigating = false;
+		}
+
 		switch (nav_mode) {
 			case NAVIGATION_PAN: {
 				_nav_pan(m, _get_warped_mouse_motion(m));
@@ -2319,7 +2332,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 				_edit.gizmo->commit_handle(_edit.gizmo_handle, _edit.gizmo_handle_secondary, _edit.gizmo_initial_value, true);
 				_edit.gizmo = Ref<EditorNode3DGizmo>();
 			}
-			if (k->get_keycode() == Key::ESCAPE && !cursor.region_select) {
+			if (k->get_keycode() == Key::ESCAPE && !cursor.region_select && !navigating) {
 				_clear_selected();
 				return;
 			}
@@ -2496,6 +2509,11 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			set_freelook_active(!is_freelook_active());
 
 		} else if (k->get_keycode() == Key::ESCAPE) {
+			if(navigating) {
+				navigating = false;
+				cursor = previous_cursor;
+				return;
+			}
 			set_freelook_active(false);
 		}
 

editor/plugins/node_3d_editor_plugin.h

@@ -439,6 +439,7 @@ class Node3DEditorViewport : public Control {
 	};
 
 	NavigationMode _get_nav_mode_from_shortcut_check(ViewportNavMouseButton p_mouse_button, Vector<ShortcutCheckSet> p_shortcut_check_sets, bool p_use_not_empty);
+	bool navigating = false;
 
 	void set_freelook_active(bool active_now);
 	void scale_freelook_speed(real_t scale);