summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-04-13 11:30:18 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-04-13 11:30:18 +0200
commit2a0fcc4c7be9b8387da8bb067260059ca3bc7822 (patch)
treedeea1b64d8643ce636a038acb3a55b612e79e93a
parente5c4ce60def58668031d7aee689ef425d331e6b9 (diff)
parent943aeb4573bdc9cdd5706dfba4b6457cc607eac7 (diff)
downloadredot-engine-2a0fcc4c7be9b8387da8bb067260059ca3bc7822.tar.gz
Merge pull request #88926 from samsface/fix_animation_player_error_dialog
Fix animation player error dialog focus
-rw-r--r--editor/plugins/animation_player_editor_plugin.cpp4
-rw-r--r--editor/plugins/animation_player_editor_plugin.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index bfac9c8cf9..43928b9c17 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -2041,10 +2041,10 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
vb->add_child(name_hb);
name_dialog->register_text_enter(name);
- error_dialog = memnew(ConfirmationDialog);
+ error_dialog = memnew(AcceptDialog);
error_dialog->set_ok_button_text(TTR("Close"));
error_dialog->set_title(TTR("Error!"));
- add_child(error_dialog);
+ name_dialog->add_child(error_dialog);
name_dialog->connect(SNAME("confirmed"), callable_mp(this, &AnimationPlayerEditor::_animation_name_edited));
diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h
index c780023c6d..a1175e2a0f 100644
--- a/editor/plugins/animation_player_editor_plugin.h
+++ b/editor/plugins/animation_player_editor_plugin.h
@@ -128,7 +128,7 @@ class AnimationPlayerEditor : public VBoxContainer {
} blend_editor;
ConfirmationDialog *name_dialog = nullptr;
- ConfirmationDialog *error_dialog = nullptr;
+ AcceptDialog *error_dialog = nullptr;
int name_dialog_op = TOOL_NEW_ANIM;
bool updating = false;