From 031165b345002eef3b2451d944fe286b12915850 Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Fri, 12 Jun 2020 12:28:23 -0400 Subject: [PATCH] [macOS] Control key + scroll wheel should zoom not pan Together with godotengine/godot#39395 for 3.2.x, this fixes godotengine/godot#32520 --- editor/plugins/canvas_item_editor_plugin.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 2f7080b1a58..7a802798668 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1325,6 +1325,18 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref &p_event, bo Ref pan_gesture = p_event; if (pan_gesture.is_valid() && !p_already_accepted) { + // If control key pressed, then zoom instead of pan + if (pan_gesture->get_control()) { + const float factor = pan_gesture->get_delta().y; + float new_zoom = _get_next_zoom_value(-1); + + if (factor != 1.f) { + new_zoom = zoom * ((new_zoom / zoom - 1.f) * factor + 1.f); + } + _zoom_on_position(new_zoom, pan_gesture->get_position()); + return true; + } + // Pan gesture const Vector2 delta = (int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom) * pan_gesture->get_delta(); view_offset.x += delta.x;