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

Merge pull request #12430 from sersoong/master-test 

3.0 Add copy button to sprite_frames_editor_plugin
This commit is contained in:
Rémi Verschelde 2017-10-28 11:32:29 +02:00 committed by GitHub
parent 8f2a4cc6a7 831d601a83
commit 44d4898a64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -142,6 +142,19 @@ void SpriteFramesEditor::_paste_pressed() {
undo_redo->commit_action(); undo_redo->commit_action();
} }
void SpriteFramesEditor::_copy_pressed() {
ERR_FAIL_COND(!frames->has_animation(edited_anim));
if (tree->get_current() < 0)
return;
Ref<Texture> r = frames->get_frame(edited_anim, tree->get_current());
if (!r.is_valid()) {
return;
}
EditorSettings::get_singleton()->set_resource_clipboard(r);
}
void SpriteFramesEditor::_empty_pressed() { void SpriteFramesEditor::_empty_pressed() {
ERR_FAIL_COND(!frames->has_animation(edited_anim)); ERR_FAIL_COND(!frames->has_animation(edited_anim));
@ -642,6 +655,7 @@ void SpriteFramesEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_empty_pressed"), &SpriteFramesEditor::_empty_pressed); ClassDB::bind_method(D_METHOD("_empty_pressed"), &SpriteFramesEditor::_empty_pressed);
ClassDB::bind_method(D_METHOD("_empty2_pressed"), &SpriteFramesEditor::_empty2_pressed); ClassDB::bind_method(D_METHOD("_empty2_pressed"), &SpriteFramesEditor::_empty2_pressed);
ClassDB::bind_method(D_METHOD("_delete_pressed"), &SpriteFramesEditor::_delete_pressed); ClassDB::bind_method(D_METHOD("_delete_pressed"), &SpriteFramesEditor::_delete_pressed);
ClassDB::bind_method(D_METHOD("_copy_pressed"), &SpriteFramesEditor::_copy_pressed);
ClassDB::bind_method(D_METHOD("_paste_pressed"), &SpriteFramesEditor::_paste_pressed); ClassDB::bind_method(D_METHOD("_paste_pressed"), &SpriteFramesEditor::_paste_pressed);
ClassDB::bind_method(D_METHOD("_file_load_request", "files", "at_position"), &SpriteFramesEditor::_file_load_request, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("_file_load_request", "files", "at_position"), &SpriteFramesEditor::_file_load_request, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("_update_library", "skipsel"), &SpriteFramesEditor::_update_library, DEFVAL(false)); ClassDB::bind_method(D_METHOD("_update_library", "skipsel"), &SpriteFramesEditor::_update_library, DEFVAL(false));
@ -725,6 +739,10 @@ SpriteFramesEditor::SpriteFramesEditor() {
load->set_tooltip(TTR("Load Resource")); load->set_tooltip(TTR("Load Resource"));
hbc->add_child(load); hbc->add_child(load);
copy = memnew(Button);
copy->set_text(TTR("Copy"));
hbc->add_child(copy);
paste = memnew(Button); paste = memnew(Button);
paste->set_text(TTR("Paste")); paste->set_text(TTR("Paste"));
hbc->add_child(paste); hbc->add_child(paste);
@ -772,6 +790,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
load->connect("pressed", this, "_load_pressed"); load->connect("pressed", this, "_load_pressed");
_delete->connect("pressed", this, "_delete_pressed"); _delete->connect("pressed", this, "_delete_pressed");
copy->connect("pressed", this, "_copy_pressed");
paste->connect("pressed", this, "_paste_pressed"); paste->connect("pressed", this, "_paste_pressed");
empty->connect("pressed", this, "_empty_pressed"); empty->connect("pressed", this, "_empty_pressed");
empty2->connect("pressed", this, "_empty2_pressed"); empty2->connect("pressed", this, "_empty2_pressed");

2
editor/plugins/sprite_frames_editor_plugin.h
View File

@ -44,6 +44,7 @@ class SpriteFramesEditor : public PanelContainer {
Button *load; Button *load;
Button *_delete; Button *_delete;
Button *copy;
Button *paste; Button *paste;
Button *empty; Button *empty;
Button *empty2; Button *empty2;
@ -72,6 +73,7 @@ class SpriteFramesEditor : public PanelContainer {
void _load_pressed(); void _load_pressed();
void _load_scene_pressed(); void _load_scene_pressed();
void _file_load_request(const PoolVector<String> &p_path, int p_at_pos = -1); void _file_load_request(const PoolVector<String> &p_path, int p_at_pos = -1);
void _copy_pressed();
void _paste_pressed(); void _paste_pressed();
void _empty_pressed(); void _empty_pressed();
void _empty2_pressed(); void _empty2_pressed();