beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibLine: Disable editing events while searching

Browse source 
This also makes the editor clean as many lines as the searching took,
for instance, in the case of <C-r><C-c>ls<tab>, two lines should be
cleaned, not just one.

Fixes #3413.
This commit is contained in:
AnotherTest 2020-09-07 00:26:28 +04:30 committed by Andreas Kling
parent e8131f503d
commit da56e208ef
Notes: sideshowbarker 2024-07-19 02:51:23 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/da56e208ef6
Pull-request: https://github.com/SerenityOS/serenity/pull/3415
Issue: https://github.com/SerenityOS/serenity/issues/3413
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibLine/InternalFunctions.cpp
View file

@ -302,11 +302,19 @@ void Editor::enter_search()
fflush(stderr); fflush(stderr);
auto search_prompt = "\x1b[32msearch:\x1b[0m "; auto search_prompt = "\x1b[32msearch:\x1b[0m ";
// While the search editor is active, we do not want editing events.
m_is_editing = false;
auto search_string_result = m_search_editor->get_line(search_prompt); auto search_string_result = m_search_editor->get_line(search_prompt);
// Grab where the search origin last was, anything up to this point will be cleared.
auto search_end_row = m_search_editor->m_origin_row;
remove_child(*m_search_editor); remove_child(*m_search_editor);
m_search_editor = nullptr; m_search_editor = nullptr;
m_is_searching = false; m_is_searching = false;
m_is_editing = true;
m_search_offset = 0; m_search_offset = 0;
// Re-enable the notifier after discarding the search editor. // Re-enable the notifier after discarding the search editor.
@ -325,7 +333,7 @@ void Editor::enter_search()
reposition_cursor(); reposition_cursor();
auto search_metrics = actual_rendered_string_metrics(search_string); auto search_metrics = actual_rendered_string_metrics(search_string);
auto metrics = actual_rendered_string_metrics(search_prompt); auto metrics = actual_rendered_string_metrics(search_prompt);
VT::clear_lines(0, metrics.lines_with_addition(search_metrics, m_num_columns)); VT::clear_lines(0, metrics.lines_with_addition(search_metrics, m_num_columns) + search_end_row - m_origin_row - 1);
reposition_cursor(); reposition_cursor();