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

Merge pull request #20450 from fire/vs_generic_search_20433 

Visualscript: Don't show Shift+A search box at every screen.
This commit is contained in:
Rémi Verschelde 2018-07-25 20:54:45 +02:00 committed by GitHub
parent 237148e80f 31008c9199
commit 19fe78fe6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/visual_script/visual_script_editor.cpp
View File

@ -1327,12 +1327,10 @@ void VisualScriptEditor::_input(const Ref<InputEvent> &p_event) {
if (mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { if (mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
revert_on_drag = String(); //so we can still drag functions revert_on_drag = String(); //so we can still drag functions
} }
Ref<InputEventKey> k = p_event;
if (k.is_valid() && k->get_scancode() == KEY_A && k->get_shift() && k->is_pressed()) {
new_connect_node_select->select_from_visual_script(String(""));
accept_event();
} }
void VisualScriptEditor::_generic_search() {
new_connect_node_select->select_from_visual_script(String(""));
} }
void VisualScriptEditor::_members_gui_input(const Ref<InputEvent> &p_event) { void VisualScriptEditor::_members_gui_input(const Ref<InputEvent> &p_event) {
@ -3148,9 +3146,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
} break; } break;
case EDIT_FIND_NODE_TYPE: { case EDIT_FIND_NODE_TYPE: {
//popup disappearing grabs focus to owner, so use call deferred _generic_search();
node_filter->call_deferred("grab_focus");
node_filter->call_deferred("select_all");
} break; } break;
case EDIT_COPY_NODES: case EDIT_COPY_NODES:
case EDIT_CUT_NODES: { case EDIT_CUT_NODES: {
@ -3487,6 +3483,8 @@ void VisualScriptEditor::_bind_methods() {
ClassDB::bind_method("_member_option", &VisualScriptEditor::_member_option); ClassDB::bind_method("_member_option", &VisualScriptEditor::_member_option);
ClassDB::bind_method("_update_available_nodes", &VisualScriptEditor::_update_available_nodes); ClassDB::bind_method("_update_available_nodes", &VisualScriptEditor::_update_available_nodes);
ClassDB::bind_method("_generic_search", &VisualScriptEditor::_generic_search);
} }
VisualScriptEditor::VisualScriptEditor() { VisualScriptEditor::VisualScriptEditor() {

3
modules/visual_script/visual_script_editor.h
View File

@ -212,6 +212,9 @@ class VisualScriptEditor : public ScriptEditorBase {
String revert_on_drag; String revert_on_drag;
void _input(const Ref<InputEvent> &p_event); void _input(const Ref<InputEvent> &p_event);
void _generic_search();
void _members_gui_input(const Ref<InputEvent> &p_event); void _members_gui_input(const Ref<InputEvent> &p_event);
void _on_nodes_delete(); void _on_nodes_delete();
void _on_nodes_duplicate(); void _on_nodes_duplicate();