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

Merge 110a29853b into 15ff450680

This commit is contained in:
MatheusMDX 2025-02-28 01:36:41 +01:00 committed by GitHub
parent 15ff450680 110a29853b
commit 51f68f236e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -1326,7 +1326,7 @@ void SpriteFramesEditor::_frame_list_gui_input(const Ref<InputEvent> &p_event) {
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
add_child(menu); add_child(menu);
menu->connect(SceneStringName(id_pressed), callable_mp(this, &SpriteFramesEditor::_menu_selected)); menu->connect(SceneStringName(id_pressed), callable_mp(this, &SpriteFramesEditor::_menu_selected));
menu->add_icon_item(get_editor_theme_icon(SNAME("ShowInFileSystem")), TTRC("Show in FileSystem")); menu->add_icon_item(get_editor_theme_icon(SNAME("ShowInFileSystem")), TTRC("Show in FileSystem"), MENU_SHOW_IN_FILESYSTEM);
} }
menu->set_position(get_screen_position() + get_local_mouse_position()); menu->set_position(get_screen_position() + get_local_mouse_position());
@ -1336,12 +1336,14 @@ void SpriteFramesEditor::_frame_list_gui_input(const Ref<InputEvent> &p_event) {
} }
} }
void SpriteFramesEditor::_menu_selected(int p_index) { void SpriteFramesEditor::_menu_selected(int p_id) {
switch (p_index) { switch (p_id) {
case MENU_SHOW_IN_FILESYSTEM: { case MENU_SHOW_IN_FILESYSTEM: {
String path = frames->get_frame_texture(edited_anim, right_clicked_frame)->get_path(); Ref<Texture2D> frame_texture = frames->get_frame_texture(edited_anim, right_clicked_frame);
ERR_FAIL_COND(frame_texture.is_null());
String path = frame_texture->get_path();
// Check if the file is an atlas resource, if it is find the source texture. // Check if the file is an atlas resource, if it is find the source texture.
Ref<AtlasTexture> at = frames->get_frame_texture(edited_anim, right_clicked_frame); Ref<AtlasTexture> at = frame_texture;
while (at.is_valid() && at->get_atlas().is_valid()) { while (at.is_valid() && at->get_atlas().is_valid()) {
path = at->get_atlas()->get_path(); path = at->get_atlas()->get_path();
at = at->get_atlas(); at = at->get_atlas();

2
editor/plugins/sprite_frames_editor_plugin.h
View File

@ -228,7 +228,7 @@ class SpriteFramesEditor : public HSplitContainer {
void _frame_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); void _frame_list_item_selected(int p_index, bool p_selected);
void _menu_selected(int p_index); void _menu_selected(int p_id);
void _zoom_in(); void _zoom_in();
void _zoom_out(); void _zoom_out();