maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow zooming while panning

Browse source
This commit is contained in:
Tomasz Chabora 2019-11-04 12:33:24 +01:00
parent 83409bac0e
commit e3cfb006a0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -1227,8 +1227,8 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event, bo
} }
if (panning) { if (panning) {
if (!b->is_pressed()) { if (!b->is_pressed() && (pan_on_scroll || (b->get_button_index() != BUTTON_WHEEL_DOWN && b->get_button_index() != BUTTON_WHEEL_UP))) {
// Stop panning the viewport (for any mouse button press) // Stop panning the viewport (for any mouse button press except zooming)
panning = false; panning = false;
} }
} }