diff options
| author | kobewi <kobewi4e@gmail.com> | 2022-01-23 13:49:53 +0100 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2022-01-23 13:49:53 +0100 |
| commit | 98692d68c3e7f3cc2a4697edfc827703b5018c36 (patch) | |
| tree | 9a02bccbae4ef082325801a6a4264e94f93fa7a6 /editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | c3d28ffa742298d7e00d0a08251ae97870e3ad88 (diff) | |
Minor tweaks and fixes to panning
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 9a81d5f0b3..4093c70c47 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1187,7 +1187,7 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event, bo return false; } -void CanvasItemEditor::_scroll_callback(Vector2 p_scroll_vec) { +void CanvasItemEditor::_scroll_callback(Vector2 p_scroll_vec, bool p_alt) { _pan_callback(-p_scroll_vec * pan_speed); } @@ -3858,7 +3858,7 @@ void CanvasItemEditor::_notification(int p_what) { anchor_mode_button->set_icon(get_theme_icon(SNAME("Anchor"), SNAME("EditorIcons"))); - panner->setup((ViewPanner::ControlScheme)EDITOR_GET("interface/editors/2d_editor_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EditorSettings::get_singleton()->get("editors/panning/simple_panning"))); + panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/2d_editor_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EditorSettings::get_singleton()->get("editors/panning/simple_panning"))); pan_speed = int(EditorSettings::get_singleton()->get("editors/panning/2d_editor_pan_speed")); warped_panning = bool(EditorSettings::get_singleton()->get("editors/panning/warped_mouse_panning")); } |