diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-08 11:50:38 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-08 11:50:38 +0100 |
| commit | a2bd7c3301360945abb4b9b62182e2ba809b10d5 (patch) | |
| tree | ae5797b7a7ae66096d1dfea401fcfa6db8a11f3e /editor/animation_bezier_editor.cpp | |
| parent | 774c4631fd316cb51eb45c6972bfd54633ed86f9 (diff) | |
| parent | 5b3d5e0a65f3eb6fd4282cd1e5f24410f3c37a5f (diff) | |
| download | redot-engine-a2bd7c3301360945abb4b9b62182e2ba809b10d5.tar.gz | |
Merge pull request #85142 from CookieBadger/animation-player-improvements
Improve usability of zooming in the animation editor
Diffstat (limited to 'editor/animation_bezier_editor.cpp')
| -rw-r--r-- | editor/animation_bezier_editor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 08306256f1..ce9bb1c92b 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -1520,7 +1520,7 @@ void AnimationBezierTrackEdit::_zoom_callback(float p_zoom_factor, Vector2 p_ori // Alternate zoom (doesn't affect timeline). timeline_v_zoom = CLAMP(timeline_v_zoom * p_zoom_factor, 0.000001, 100000); } else { - timeline->get_zoom()->set_value(timeline->get_zoom()->get_value() / p_zoom_factor); + timeline->_zoom_callback(p_zoom_factor, p_origin, p_event); } timeline_v_scroll = timeline_v_scroll + (p_origin.y - get_size().y / 2.0) * (timeline_v_zoom - v_zoom_orig); queue_redraw(); @@ -1688,6 +1688,7 @@ void AnimationBezierTrackEdit::_bind_methods() { AnimationBezierTrackEdit::AnimationBezierTrackEdit() { panner.instantiate(); panner->set_callbacks(callable_mp(this, &AnimationBezierTrackEdit::_pan_callback), callable_mp(this, &AnimationBezierTrackEdit::_zoom_callback)); + panner->set_scroll_zoom_factor(AnimationTimelineEdit::SCROLL_ZOOM_FACTOR); play_position = memnew(Control); play_position->set_mouse_filter(MOUSE_FILTER_PASS); |