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

Merge pull request #57672 from fire-forge/fix-image-drop-nodes

This commit is contained in:
Rémi Verschelde 2022-02-06 18:11:12 +01:00 committed by GitHub
parent 79a4d782a5 871b9fc352
commit 95719930a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -5797,22 +5797,17 @@ void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &
editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(editor->get_edited_scene()->get_path_to(parent)) + "/" + new_name)); editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(editor->get_edited_scene()->get_path_to(parent)) + "/" + new_name));
} }
String node_class = child->get_class(); if (Object::cast_to<TouchScreenButton>(child) || Object::cast_to<TextureButton>(child)) {
if (node_class == "Polygon2D") { editor_data->get_undo_redo().add_do_property(child, "texture_normal", texture);
editor_data->get_undo_redo().add_do_property(child, "texture/texture", texture);
} else if (node_class == "TouchScreenButton") {
editor_data->get_undo_redo().add_do_property(child, "normal", texture);
} else if (node_class == "TextureButton") {
editor_data->get_undo_redo().add_do_property(child, "texture_button", texture);
} else { } else {
editor_data->get_undo_redo().add_do_property(child, "texture", texture); editor_data->get_undo_redo().add_do_property(child, "texture", texture);
} }
// make visible for certain node type // make visible for certain node type
if (ClassDB::is_parent_class(node_class, "Control")) { if (ClassDB::is_parent_class(child->get_class(), "Control")) {
Size2 texture_size = texture->get_size(); Size2 texture_size = texture->get_size();
editor_data->get_undo_redo().add_do_property(child, "rect_size", texture_size); editor_data->get_undo_redo().add_do_property(child, "rect_size", texture_size);
} else if (node_class == "Polygon2D") { } else if (Object::cast_to<Polygon2D>(child)) {
Size2 texture_size = texture->get_size(); Size2 texture_size = texture->get_size();
Vector<Vector2> list = { Vector<Vector2> list = {
Vector2(0, 0), Vector2(0, 0),
@ -6069,10 +6064,21 @@ Node *CanvasItemEditorViewport::_make_texture_node_type(String texture_node_type
} }
void CanvasItemEditorViewport::_notification(int p_what) { void CanvasItemEditorViewport::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
List<BaseButton *> btn_list;
button_group->get_buttons(&btn_list);
for (int i = 0; i < btn_list.size(); i++) {
CheckBox *check = Object::cast_to<CheckBox>(btn_list[i]);
check->set_icon(get_theme_icon(check->get_text(), SNAME("EditorIcons")));
}
label->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
}
switch (p_what) { switch (p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
connect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit)); connect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit));
label->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
disconnect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit)); disconnect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit));
@ -6123,7 +6129,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte
btn_group = memnew(VBoxContainer); btn_group = memnew(VBoxContainer);
vbc->add_child(btn_group); vbc->add_child(btn_group);
btn_group->set_h_size_flags(0); btn_group->set_h_size_flags(SIZE_EXPAND_FILL);
button_group.instantiate(); button_group.instantiate();
for (int i = 0; i < texture_node_types.size(); i++) { for (int i = 0; i < texture_node_types.size(); i++) {