Skip to content

Commit

Permalink
Merge pull request #86736 from Illauriel/rename-add-lib
Browse files Browse the repository at this point in the history
Add icon, tooltip, rename button in AnimationLibraryEditor for clarity.
  • Loading branch information
akien-mga committed Jan 11, 2024
2 parents 339a793 + 184b74c commit 4893669
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
23 changes: 17 additions & 6 deletions editor/plugins/animation_library_editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,15 @@ void AnimationLibraryEditor::show_dialog() {
popup_centered_ratio(0.5);
}

void AnimationLibraryEditor::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_THEME_CHANGED: {
new_library_button->set_icon(get_editor_theme_icon(SNAME("Add")));
load_library_button->set_icon(get_editor_theme_icon(SNAME("Load")));
}
}
}

void AnimationLibraryEditor::_update_editor(Object *p_mixer) {
emit_signal("update_editor", p_mixer);
}
Expand Down Expand Up @@ -800,12 +809,14 @@ AnimationLibraryEditor::AnimationLibraryEditor() {
VBoxContainer *vb = memnew(VBoxContainer);
HBoxContainer *hb = memnew(HBoxContainer);
hb->add_spacer(true);
Button *b = memnew(Button(TTR("Add Library")));
b->connect("pressed", callable_mp(this, &AnimationLibraryEditor::_add_library));
hb->add_child(b);
b = memnew(Button(TTR("Load Library")));
b->connect("pressed", callable_mp(this, &AnimationLibraryEditor::_load_library));
hb->add_child(b);
new_library_button = memnew(Button(TTR("New Library")));
new_library_button->set_tooltip_text(TTR("Create new empty animation library."));
new_library_button->connect("pressed", callable_mp(this, &AnimationLibraryEditor::_add_library));
hb->add_child(new_library_button);
load_library_button = memnew(Button(TTR("Load Library")));
load_library_button->set_tooltip_text(TTR("Load animation library from disk."));
load_library_button->connect("pressed", callable_mp(this, &AnimationLibraryEditor::_load_library));
hb->add_child(load_library_button);
vb->add_child(hb);
tree = memnew(Tree);
vb->add_child(tree);
Expand Down
4 changes: 4 additions & 0 deletions editor/plugins/animation_library_editor.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ class AnimationLibraryEditor : public AcceptDialog {
StringName file_dialog_animation;
StringName file_dialog_library;

Button *new_library_button = nullptr;
Button *load_library_button = nullptr;

AcceptDialog *error_dialog = nullptr;
bool adding_animation = false;
StringName adding_animation_to_library;
Expand Down Expand Up @@ -108,6 +111,7 @@ class AnimationLibraryEditor : public AcceptDialog {
bool updating = false;

protected:
void _notification(int p_what);
void _update_editor(Object *p_mixer);
static void _bind_methods();

Expand Down

0 comments on commit 4893669

Please sign in to comment.