seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33331 from KoBeWi/just_keep_panning

Browse Source 
Allow zooming while panning
This commit is contained in:
Rémi Verschelde
2019-11-04 12:48:14 +01:00
committed by GitHub
parent 83409bac0e e3cfb006a0
commit 86da206b84
1 changed files with 2 additions and 2 deletions
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 (!b->is_pressed()) {
// Stop panning the viewport (for any mouse button press)
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 except zooming)
panning = false;
}
}