godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge ebada10e3e into 15ff450680

This commit is contained in:
Olanti 2025-02-28 01:36:23 +01:00 committed by GitHub
parent 15ff450680 ebada10e3e
commit c70f89bd6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -1302,6 +1302,15 @@ void SpriteFramesEditor::_animation_speed_changed(double p_value) {
undo_redo->commit_action();
}
void SpriteFramesEditor::_animation_list_gui_input(const Ref<InputEvent> &p_event) {
if (ED_IS_SHORTCUT("sprite_frames/rename_animation", p_event) && p_event->is_pressed() && !p_event->is_echo()) {
if (animations->get_selected()) {
animations->edit_selected();
accept_event();
}
}
}
void SpriteFramesEditor::_frame_list_gui_input(const Ref<InputEvent> &p_event) {
const Ref<InputEventMouseButton> mb = p_event;
@ -1997,6 +2006,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
// HACK: The cell_selected signal is emitted before the FPS spinbox loses focus and applies the change.
animations->connect("cell_selected", callable_mp(this, &SpriteFramesEditor::_animation_selected), CONNECT_DEFERRED);
animations->connect("item_edited", callable_mp(this, &SpriteFramesEditor::_animation_name_edited));
animations->connect(SceneStringName(gui_input), callable_mp(this, &SpriteFramesEditor::_animation_list_gui_input));
animations->set_theme_type_variation("TreeSecondary");
animations->set_allow_reselect(true);
@ -2006,6 +2016,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
duplicate_anim->set_shortcut(ED_SHORTCUT("sprite_frames/duplicate_animation", TTRC("Duplicate Animation"), KeyModifierMask::CMD_OR_CTRL | Key::D));
delete_anim->set_shortcut_context(animations);
delete_anim->set_shortcut(ED_SHORTCUT("sprite_frames/delete_animation", TTRC("Delete Animation"), Key::KEY_DELETE));
rename_anim = ED_SHORTCUT("sprite_frames/rename_animation", TTRC("Rename Animation"), Key::F2);
missing_anim_label = memnew(Label);
missing_anim_label->set_text(TTR("This resource does not have any animations."));

2
editor/plugins/sprite_frames_editor_plugin.h
View File

@ -127,6 +127,7 @@ class SpriteFramesEditor : public HSplitContainer {
Button *add_anim = nullptr;
Button *duplicate_anim = nullptr;
Button *delete_anim = nullptr;
Ref<Shortcut> rename_anim;
SpinBox *anim_speed = nullptr;
Button *anim_loop = nullptr;
@ -224,6 +225,7 @@ class SpriteFramesEditor : public HSplitContainer {
void _animation_loop_changed();
void _animation_speed_resized();
void _animation_speed_changed(double p_value);
void _animation_list_gui_input(const Ref<InputEvent> &p_event);
void _frame_list_gui_input(const Ref<InputEvent> &p_event);
void _frame_list_item_selected(int p_index, bool p_selected);