diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-25 11:59:11 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-25 11:59:11 +0100 |
| commit | fc400d15627a70c1138bdbfb1ee1f9de472e9ae9 (patch) | |
| tree | b0c051532b56e8d7f40216d844e5dde4726f2b5a /editor/plugins/canvas_item_editor_plugin.h | |
| parent | 4368191a9f9c6290805dd4094c36379776128338 (diff) | |
| parent | a3b431b09d1d11b31feb40fed0785c85e753069c (diff) | |
Merge pull request #71685 from groud/gesture_into_viewpanner
Add gesture to ViewPanner and simplify a bit its API
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.h')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 1e01eac82d..ebe87a56f7 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -363,10 +363,8 @@ private: Ref<ViewPanner> panner; bool warped_panning = true; - int pan_speed = 20; - void _scroll_callback(Vector2 p_scroll_vec, bool p_alt); - void _pan_callback(Vector2 p_scroll_vec); - void _zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin, bool p_alt); + void _pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event); + void _zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event); bool _is_node_locked(const Node *p_node) const; bool _is_node_movable(const Node *p_node, bool p_popup_warning = false); |