godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix update timing when AnimationEditor changes FPS

This commit is contained in:
Silc Renew 2022-11-17 12:24:48 +09:00
parent 2846ea1ffa
commit cb4bdc7e1b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/animation_track_editor.cpp
View File

@ -1678,6 +1678,7 @@ void AnimationTimelineEdit::_notification(int p_what) {
} }
draw_line(Vector2(0, get_size().height), get_size(), linecolor, Math::round(EDSCALE)); draw_line(Vector2(0, get_size().height), get_size(), linecolor, Math::round(EDSCALE));
update_values();
} break; } break;
} }
} }
@ -1700,7 +1701,6 @@ void AnimationTimelineEdit::set_animation(const Ref<Animation> &p_animation, boo
play_position->hide(); play_position->hide();
} }
queue_redraw(); queue_redraw();
update_values();
} }
Size2 AnimationTimelineEdit::get_minimum_size() const { Size2 AnimationTimelineEdit::get_minimum_size() const {
@ -1749,6 +1749,7 @@ void AnimationTimelineEdit::update_values() {
length->set_step(1); length->set_step(1);
length->set_tooltip_text(TTR("Animation length (frames)")); length->set_tooltip_text(TTR("Animation length (frames)"));
time_icon->set_tooltip_text(TTR("Animation length (frames)")); time_icon->set_tooltip_text(TTR("Animation length (frames)"));
track_edit->editor->_update_key_edit();
} else { } else {
length->set_value(animation->get_length()); length->set_value(animation->get_length());
length->set_step(0.001); length->set_step(0.001);
@ -1893,7 +1894,6 @@ void AnimationTimelineEdit::_zoom_callback(Vector2 p_scroll_vec, Vector2 p_origi
void AnimationTimelineEdit::set_use_fps(bool p_use_fps) { void AnimationTimelineEdit::set_use_fps(bool p_use_fps) {
use_fps = p_use_fps; use_fps = p_use_fps;
update_values();
queue_redraw(); queue_redraw();
} }
@ -4793,6 +4793,7 @@ void AnimationTrackEditor::_update_step(double p_new_step) {
if (step_value != 0.0) { if (step_value != 0.0) {
step_value = 1.0 / step_value; step_value = 1.0 / step_value;
} }
timeline->queue_redraw();
} }
undo_redo->add_do_method(animation.ptr(), "set_step", step_value); undo_redo->add_do_method(animation.ptr(), "set_step", step_value);
undo_redo->add_undo_method(animation.ptr(), "set_step", animation->get_step()); undo_redo->add_undo_method(animation.ptr(), "set_step", animation->get_step());

2
editor/animation_track_editor.h
View File

@ -135,6 +135,7 @@ class AnimationTrackEditor;
class AnimationTrackEdit : public Control { class AnimationTrackEdit : public Control {
GDCLASS(AnimationTrackEdit, Control); GDCLASS(AnimationTrackEdit, Control);
friend class AnimationTimelineEdit;
enum { enum {
MENU_CALL_MODE_CONTINUOUS, MENU_CALL_MODE_CONTINUOUS,
@ -293,6 +294,7 @@ public:
class AnimationTrackEditor : public VBoxContainer { class AnimationTrackEditor : public VBoxContainer {
GDCLASS(AnimationTrackEditor, VBoxContainer); GDCLASS(AnimationTrackEditor, VBoxContainer);
friend class AnimationTimelineEdit;
Ref<Animation> animation; Ref<Animation> animation;
bool read_only = false; bool read_only = false;