diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-14 16:13:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 16:13:53 +0100 |
| commit | 6689a9360c2dae0ca940e4e470c4d0a0e0a9bef4 (patch) | |
| tree | de3203e2780dc1dffa1f8a2d724ef6b8674757a0 /editor/animation_track_editor.h | |
| parent | 387f2744f70618c9e5efd0bc2d0cedcb7c2b25b9 (diff) | |
| parent | fbb5580b3d1c298ed3a9565acc2da801ac1ac18a (diff) | |
Merge pull request #56756 from KoBeWi/great_unification_theory
Diffstat (limited to 'editor/animation_track_editor.h')
| -rw-r--r-- | editor/animation_track_editor.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index b5d44bc0d3..2a2b20ada9 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -48,8 +48,8 @@ #include "scene_tree_editor.h" class AnimationPlayer; - class AnimationTrackEdit; +class ViewPanner; class AnimationTimelineEdit : public Range { GDCLASS(AnimationTimelineEdit, Range); @@ -81,9 +81,11 @@ class AnimationTimelineEdit : public Range { bool editing; bool use_fps; - bool panning_timeline; - float panning_timeline_from; - float panning_timeline_at; + Ref<ViewPanner> panner; + void _scroll_callback(Vector2 p_scroll_vec); + void _pan_callback(Vector2 p_scroll_vec); + void _zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin); + bool dragging_timeline; bool dragging_hsize; float dragging_hsize_from; @@ -374,6 +376,11 @@ class AnimationTrackEditor : public VBoxContainer { PropertyInfo _find_hint_for_track(int p_idx, NodePath &r_base_path, Variant *r_current_val = nullptr); + Ref<ViewPanner> panner; + void _scroll_callback(Vector2 p_scroll_vec); + void _pan_callback(Vector2 p_scroll_vec); + void _zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin); + void _timeline_value_changed(double); float insert_key_from_track_call_ofs; |