diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-06-07 18:59:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 18:59:37 +0200 |
| commit | 5f5d629c8ad654fddbf17850c6fad2999d10daf7 (patch) | |
| tree | 7584f2bdde2d3e8cc322d73396b66d2cc0714111 /editor | |
| parent | 840ac8c0187b7cfdc13abf9091f2537b34f6552b (diff) | |
| parent | 6e1bcb2b44ca15a5bc84a4ec0cf80e018c5006cb (diff) | |
Merge pull request #9070 from Noshyaar/pr-help2
Fix Script Editor stealing focus on class search text changed
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_help.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 7fe483c834..11cb61370d 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -252,8 +252,8 @@ void EditorHelpSearch::_confirmed() { return; String mdata = ti->get_metadata(0); + EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT); emit_signal("go_to_help", mdata); - EditorNode::get_singleton()->call("_editor_select", EditorNode::EDITOR_SCRIPT); // in case EditorHelpSearch beeen invoked on top of other editor window // go to that hide(); } @@ -361,8 +361,8 @@ void EditorHelpIndex::_tree_item_selected() { if (!s) return; + EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT); emit_signal("open_class", s->get_text(0)); - EditorNode::get_singleton()->call("_editor_select", EditorNode::EDITOR_SCRIPT); hide(); //_goto_desc(s->get_text(0)); @@ -374,7 +374,6 @@ void EditorHelpIndex::select_class(const String &p_class) { return; tree_item_map[p_class]->select(0); class_list->ensure_cursor_is_visible(); - EditorNode::get_singleton()->call("_editor_select", EditorNode::EDITOR_SCRIPT); // in case EditorHelpIndex beeen invoked on top of other editor window } void EditorHelpIndex::popup() { @@ -1279,7 +1278,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { void EditorHelp::_request_help(const String &p_string) { Error err = _goto_desc(p_string); if (err == OK) { - EditorNode::get_singleton()->call("_editor_select", EditorNode::EDITOR_SCRIPT); + EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT); } //100 palabras } |