summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-07-05 09:44:11 +0200
committerGitHub <noreply@github.com>2019-07-05 09:44:11 +0200
commitc4016398200014e911759905991e333688ff0ffd (patch)
tree0da4667a7568b9fabd5687cb228e5dcd65709e72
parent0b6c76efd723f9ac4f717a8610db9ef9d0c513aa (diff)
parent2685d3324cae4fcf7ded3e145c5448720bec76a6 (diff)
Merge pull request #30326 from Anutrix/replace-all-fix-for-now
Got replace-all working without breaking search
-rw-r--r--editor/code_editor.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index 00d026baa4..7c396e1da3 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -341,7 +341,11 @@ bool FindReplaceBar::search_prev() {
bool FindReplaceBar::search_next() {
uint32_t flags = 0;
- String text = get_search_text();
+ String text;
+ if (replace_all_mode)
+ text = get_replace_text();
+ else
+ text = get_search_text();
if (is_whole_words())
flags |= TextEdit::SEARCH_WHOLE_WORDS;