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

Merge pull request #76122 from spanzeri/fix_animation_snap_slider_crash

Browse Source 
Fix editor spin slider remaining editable if set read_only during and edit and fix related animation player crash
This commit is contained in:
Rémi Verschelde 2023-04-24 16:45:09 +02:00
commit 91bcfa8896
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/animation_track_editor.cpp
View File

@ -4639,6 +4639,10 @@ void AnimationTrackEditor::_update_scroll(double) {
}
void AnimationTrackEditor::_update_step(double p_new_step) {
if (animation.is_null()) {
return;
}
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->create_action(TTR("Change Animation Step"));
float step_value = p_new_step;

11
editor/gui/editor_spin_slider.cpp
View File

@ -573,8 +573,13 @@ void EditorSpinSlider::_value_focus_exited() {
return;
}
if (is_read_only()) {
// Spin slider has become read only while it was being edited.
return;
}
_evaluate_input_text();
// focus is not on the same element after the vlalue_input was exited
// focus is not on the same element after the value_input was exited
// -> focus is on next element
// -> TAB was pressed
// -> modal_close was not called
@ -604,6 +609,10 @@ void EditorSpinSlider::_grabber_mouse_exited() {
void EditorSpinSlider::set_read_only(bool p_enable) {
read_only = p_enable;
if (read_only && value_input) {
value_input->release_focus();
}
queue_redraw();
}