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

Merge pull request #62151 from tdaven/tdaven/fix-62149

Browse Source 
Add missing new function parameter to fix button presses.
This commit is contained in:
Rémi Verschelde 2022-06-18 11:00:41 +02:00 committed by GitHub
commit 94e962e27f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/animation_library_editor.cpp
View File

@ -419,12 +419,12 @@ void AnimationLibraryEditor::_item_renamed() {
} }
} }
void AnimationLibraryEditor::_button_pressed(TreeItem *p_item, int p_column, int p_button) { void AnimationLibraryEditor::_button_pressed(TreeItem *p_item, int p_column, int p_id, MouseButton p_button) {
if (p_item->get_parent() == tree->get_root()) { if (p_item->get_parent() == tree->get_root()) {
// Library // Library
StringName lib_name = p_item->get_metadata(0); StringName lib_name = p_item->get_metadata(0);
Ref<AnimationLibrary> al = player->call("get_animation_library", lib_name); Ref<AnimationLibrary> al = player->call("get_animation_library", lib_name);
switch (p_button) { switch (p_id) {
case LIB_BUTTON_ADD: { case LIB_BUTTON_ADD: {
add_library_dialog->set_title(TTR("Animation Name:")); add_library_dialog->set_title(TTR("Animation Name:"));
add_library_name->set_text(""); add_library_name->set_text("");
@ -519,7 +519,7 @@ void AnimationLibraryEditor::_button_pressed(TreeItem *p_item, int p_column, int
Ref<AnimationLibrary> al = player->call("get_animation_library", lib_name); Ref<AnimationLibrary> al = player->call("get_animation_library", lib_name);
Ref<Animation> anim = al->get_animation(anim_name); Ref<Animation> anim = al->get_animation(anim_name);
ERR_FAIL_COND(!anim.is_valid()); ERR_FAIL_COND(!anim.is_valid());
switch (p_button) { switch (p_id) {
case ANIM_BUTTON_COPY: { case ANIM_BUTTON_COPY: {
if (anim->get_name() == "") { if (anim->get_name() == "") {
anim->set_name(anim_name); // Keep the name around anim->set_name(anim_name); // Keep the name around

2
editor/plugins/animation_library_editor.h
View File

@ -99,7 +99,7 @@ class AnimationLibraryEditor : public AcceptDialog {
void _load_file(String p_path); void _load_file(String p_path);
void _item_renamed(); void _item_renamed();
void _button_pressed(TreeItem *p_item, int p_column, int p_button); void _button_pressed(TreeItem *p_item, int p_column, int p_id, MouseButton p_button);
void _file_popup_selected(int p_id); void _file_popup_selected(int p_id);