diff options
| author | reduz <reduzio@gmail.com> | 2014-06-17 11:56:09 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-06-17 11:56:09 -0300 |
| commit | 6cb3c94b035e4a8dcd34718e12ccd501b2631ced (patch) | |
| tree | d3e762e06d948c4b8d549d59f244b22a0a6cd657 | |
| parent | a285708a0c77e9d306297ae8fb227aeb7207ad86 (diff) | |
| parent | eb6f7f38c0dcbe15cd0d9e1011913fa6e7f81013 (diff) | |
Merge pull request #509 from marynate/PR-script-editor-replace-dialog
Script editor: Add selected text in replace dialog automatically
| -rw-r--r-- | tools/editor/code_editor.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp index d86e48f74e..281415e4b7 100644 --- a/tools/editor/code_editor.cpp +++ b/tools/editor/code_editor.cpp @@ -102,12 +102,21 @@ void FindReplaceDialog::popup_replace() { bool do_selection=(text_edit->is_selection_active() && text_edit->get_selection_from_line() < text_edit->get_selection_to_line()); set_replace_selection_only(do_selection); + if (!do_selection && text_edit->is_selection_active()) { + search_text->set_text(text_edit->get_selection_text()); + } + replace_mc->show(); replace_label->show(); replace_vb->show(); popup_centered(Point2(300,300)); - search_text->grab_focus(); - search_text->select_all(); + if (search_text->get_text()!="" && replace_text->get_text()=="") { + search_text->select(0,0); + replace_text->grab_focus(); + } else { + search_text->grab_focus(); + search_text->select_all(); + } error_label->set_text(""); if (prompt->is_pressed()) { @@ -372,7 +381,7 @@ void FindReplaceDialog::_bind_methods() { FindReplaceDialog::FindReplaceDialog() { - set_self_opacity(0.6); + set_self_opacity(0.8); VBoxContainer *vb = memnew( VBoxContainer ); add_child(vb); @@ -382,7 +391,7 @@ FindReplaceDialog::FindReplaceDialog() { search_text = memnew( LineEdit ); vb->add_margin_child("Search",search_text); search_text->connect("text_entered", this,"_search_text_entered"); - search_text->set_self_opacity(0.7); + //search_text->set_self_opacity(0.7); @@ -396,7 +405,7 @@ FindReplaceDialog::FindReplaceDialog() { replace_text->set_anchor( MARGIN_RIGHT, ANCHOR_END ); replace_text->set_begin( Point2(15,132) ); replace_text->set_end( Point2(15,135) ); - replace_text->set_self_opacity(0.7); + //replace_text->set_self_opacity(0.7); replace_mc->add_child(replace_text); |