diff options
| author | emild <emil.dobetsberger@gmail.com> | 2024-02-12 14:28:13 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-13 10:32:50 +0100 |
| commit | b66b188cf9a310940283a544aaf0b3c37b923e96 (patch) | |
| tree | 945f7e002137affaa2fb6a97489ea30e862e9514 /editor/animation_bezier_editor.cpp | |
| parent | 9272f7b53db1f7f142df43981adec5cebdfbd179 (diff) | |
| download | redot-engine-b66b188cf9a310940283a544aaf0b3c37b923e96.tar.gz | |
Fix vertical zoom factor in Animation Bezier Editor
Diffstat (limited to 'editor/animation_bezier_editor.cpp')
| -rw-r--r-- | editor/animation_bezier_editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 7c269bd6ed..34ca653ff7 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -1548,7 +1548,8 @@ 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->_zoom_callback(p_zoom_factor, p_origin, p_event); + float zoom_factor = p_zoom_factor > 1.0 ? AnimationTimelineEdit::SCROLL_ZOOM_FACTOR_IN : AnimationTimelineEdit::SCROLL_ZOOM_FACTOR_OUT; + timeline->_zoom_callback(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(); @@ -1823,7 +1824,6 @@ 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); |