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

Merge pull request #36595 from Chaosus/vs_popup_menu2

Browse Source 
Place paste after copy in new popup menu in visual shader
This commit is contained in:
Yuri Roubinsky 2020-02-27 14:19:02 +03:00 committed by GitHub
commit e437bcbccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -1623,9 +1623,9 @@ void VisualShaderEditor::_graph_gui_input(const Ref<InputEvent> &p_event) {
_show_members_dialog(true); _show_members_dialog(true);
} else { } else {
popup_menu->set_item_disabled(NodeMenuOptions::COPY, to_change.empty()); popup_menu->set_item_disabled(NodeMenuOptions::COPY, to_change.empty());
popup_menu->set_item_disabled(NodeMenuOptions::PASTE, copy_nodes_buffer.empty());
popup_menu->set_item_disabled(NodeMenuOptions::DELETE, to_change.empty()); popup_menu->set_item_disabled(NodeMenuOptions::DELETE, to_change.empty());
popup_menu->set_item_disabled(NodeMenuOptions::DUPLICATE, to_change.empty()); popup_menu->set_item_disabled(NodeMenuOptions::DUPLICATE, to_change.empty());
popup_menu->set_item_disabled(NodeMenuOptions::PASTE, copy_nodes_buffer.empty());
menu_point = graph->get_local_mouse_position(); menu_point = graph->get_local_mouse_position();
Point2 gpos = Input::get_singleton()->get_mouse_position(); Point2 gpos = Input::get_singleton()->get_mouse_position();
popup_menu->set_position(gpos); popup_menu->set_position(gpos);
@ -1952,7 +1952,7 @@ void VisualShaderEditor::_paste_nodes(bool p_use_custom_position, const Vector2
_dup_update_excluded(type, copy_nodes_excluded_buffer); // to prevent selection of previous copies at new paste _dup_update_excluded(type, copy_nodes_excluded_buffer); // to prevent selection of previous copies at new paste
} }
void VisualShaderEditor::_on_nodes_delete() { void VisualShaderEditor::_delete_nodes() {
VisualShader::Type type = VisualShader::Type(edit_type->get_selected()); VisualShader::Type type = VisualShader::Type(edit_type->get_selected());
List<int> to_erase; List<int> to_erase;
@ -2146,15 +2146,15 @@ void VisualShaderEditor::_node_menu_id_pressed(int p_idx) {
case NodeMenuOptions::COPY: case NodeMenuOptions::COPY:
_copy_nodes(); _copy_nodes();
break; break;
case NodeMenuOptions::PASTE:
_paste_nodes(true, menu_point);
break;
case NodeMenuOptions::DELETE: case NodeMenuOptions::DELETE:
_on_nodes_delete(); _delete_nodes();
break; break;
case NodeMenuOptions::DUPLICATE: case NodeMenuOptions::DUPLICATE:
_duplicate_nodes(); _duplicate_nodes();
break; break;
case NodeMenuOptions::PASTE:
_paste_nodes(true, menu_point);
break;
} }
} }
@ -2296,7 +2296,7 @@ void VisualShaderEditor::_bind_methods() {
ClassDB::bind_method("_node_selected", &VisualShaderEditor::_node_selected); ClassDB::bind_method("_node_selected", &VisualShaderEditor::_node_selected);
ClassDB::bind_method("_scroll_changed", &VisualShaderEditor::_scroll_changed); ClassDB::bind_method("_scroll_changed", &VisualShaderEditor::_scroll_changed);
ClassDB::bind_method("_delete_request", &VisualShaderEditor::_delete_request); ClassDB::bind_method("_delete_request", &VisualShaderEditor::_delete_request);
ClassDB::bind_method("_on_nodes_delete", &VisualShaderEditor::_on_nodes_delete); ClassDB::bind_method("_delete_nodes", &VisualShaderEditor::_delete_nodes);
ClassDB::bind_method("_node_changed", &VisualShaderEditor::_node_changed); ClassDB::bind_method("_node_changed", &VisualShaderEditor::_node_changed);
ClassDB::bind_method("_edit_port_default_input", &VisualShaderEditor::_edit_port_default_input); ClassDB::bind_method("_edit_port_default_input", &VisualShaderEditor::_edit_port_default_input);
ClassDB::bind_method("_port_edited", &VisualShaderEditor::_port_edited); ClassDB::bind_method("_port_edited", &VisualShaderEditor::_port_edited);
@ -2388,7 +2388,7 @@ VisualShaderEditor::VisualShaderEditor() {
graph->connect_compat("duplicate_nodes_request", this, "_duplicate_nodes"); graph->connect_compat("duplicate_nodes_request", this, "_duplicate_nodes");
graph->connect_compat("copy_nodes_request", this, "_copy_nodes"); graph->connect_compat("copy_nodes_request", this, "_copy_nodes");
graph->connect_compat("paste_nodes_request", this, "_paste_nodes"); graph->connect_compat("paste_nodes_request", this, "_paste_nodes");
graph->connect_compat("delete_nodes_request", this, "_on_nodes_delete"); graph->connect_compat("delete_nodes_request", this, "_delete_nodes");
graph->connect_compat("gui_input", this, "_graph_gui_input"); graph->connect_compat("gui_input", this, "_graph_gui_input");
graph->connect_compat("connection_to_empty", this, "_connection_to_empty"); graph->connect_compat("connection_to_empty", this, "_connection_to_empty");
graph->connect_compat("connection_from_empty", this, "_connection_from_empty"); graph->connect_compat("connection_from_empty", this, "_connection_from_empty");
@ -2465,9 +2465,9 @@ VisualShaderEditor::VisualShaderEditor() {
popup_menu->add_item("Add Node", NodeMenuOptions::ADD); popup_menu->add_item("Add Node", NodeMenuOptions::ADD);
popup_menu->add_separator(); popup_menu->add_separator();
popup_menu->add_item("Copy", NodeMenuOptions::COPY); popup_menu->add_item("Copy", NodeMenuOptions::COPY);
popup_menu->add_item("Paste", NodeMenuOptions::PASTE);
popup_menu->add_item("Delete", NodeMenuOptions::DELETE); popup_menu->add_item("Delete", NodeMenuOptions::DELETE);
popup_menu->add_item("Duplicate", NodeMenuOptions::DUPLICATE); popup_menu->add_item("Duplicate", NodeMenuOptions::DUPLICATE);
popup_menu->add_item("Paste", NodeMenuOptions::PASTE);
popup_menu->connect_compat("id_pressed", this, "_node_menu_id_pressed"); popup_menu->connect_compat("id_pressed", this, "_node_menu_id_pressed");
/////////////////////////////////////// ///////////////////////////////////////

4
editor/plugins/visual_shader_editor_plugin.h
View File

@ -95,9 +95,9 @@ class VisualShaderEditor : public VBoxContainer {
ADD, ADD,
SEPARATOR, // ignore SEPARATOR, // ignore
COPY, COPY,
PASTE,
DELETE, DELETE,
DUPLICATE, DUPLICATE,
PASTE,
}; };
Tree *members; Tree *members;
@ -191,7 +191,7 @@ class VisualShaderEditor : public VBoxContainer {
void _node_selected(Object *p_node); void _node_selected(Object *p_node);
void _delete_request(int); void _delete_request(int);
void _on_nodes_delete(); void _delete_nodes();
void _removed_from_graph(); void _removed_from_graph();