parent
b383484e44
commit
2144eb05df
|
@ -226,6 +226,10 @@ void FindReplaceBar::_replace_all() {
|
||||||
|
|
||||||
text_edit->begin_complex_operation();
|
text_edit->begin_complex_operation();
|
||||||
|
|
||||||
|
if (selection_enabled && is_selection_only()) {
|
||||||
|
text_edit->cursor_set_line(selection_begin.width);
|
||||||
|
text_edit->cursor_set_column(selection_begin.height);
|
||||||
|
}
|
||||||
if (search_current()) {
|
if (search_current()) {
|
||||||
do {
|
do {
|
||||||
// replace area
|
// replace area
|
||||||
|
@ -243,7 +247,7 @@ void FindReplaceBar::_replace_all() {
|
||||||
|
|
||||||
if (selection_enabled && is_selection_only()) {
|
if (selection_enabled && is_selection_only()) {
|
||||||
if (match_from < selection_begin || match_to > selection_end) {
|
if (match_from < selection_begin || match_to > selection_end) {
|
||||||
continue;
|
break; // Done.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Replace but adjust selection bounds.
|
// Replace but adjust selection bounds.
|
||||||
|
@ -289,6 +293,10 @@ void FindReplaceBar::_get_search_from(int &r_line, int &r_col) {
|
||||||
r_line = text_edit->cursor_get_line();
|
r_line = text_edit->cursor_get_line();
|
||||||
r_col = text_edit->cursor_get_column();
|
r_col = text_edit->cursor_get_column();
|
||||||
|
|
||||||
|
if (text_edit->is_selection_active() && is_selection_only()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (r_line == result_line && r_col >= result_col && r_col <= result_col + get_search_text().length()) {
|
if (r_line == result_line && r_col >= result_col && r_col <= result_col + get_search_text().length()) {
|
||||||
r_col = result_col;
|
r_col = result_col;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue