LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-07-15 01:00:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Base the current find in page position on the current selection

Browse Source 
Prior to this change, our find in page function always highlighted the
first match whenever the query was updated. After this change the
current match index is set such that it is the first match to occur
after the end of the current selection.

This means the current match position is not lost if the user modifies
their existing query.

This matches the behavior of find in page in other browsers.
This commit is contained in:
Tim Ledbetter 2024-06-23 19:05:45 +01:00 committed by Andreas Kling
parent 0b33331f36
commit 0b753dcb44
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Userland/Libraries/LibWeb/Page/Page.cpp
View File

@ -572,8 +572,41 @@ Page::FindInPageResult Page::perform_find_in_page_query(FindInPageQuery const& q
VERIFY(top_level_traversable_is_initialized());
Vector<JS::Handle<DOM::Range>> all_matches;
for (auto const& document : documents_in_active_window()) {
auto find_current_match_index = [this, &direction](auto& document, auto& matches) -> size_t {
// Always return the first match if there is no active query.
if (!m_last_find_in_page_query.has_value())
return 0;
auto selection = document.get_selection();
if (!selection)
return 0;
auto range = selection->range();
if (!range)
return 0;
for (size_t i = 0; i < matches.size(); ++i) {
auto boundary_comparison_or_error = matches[i]->compare_boundary_points(DOM::Range::HowToCompareBoundaryPoints::START_TO_START, *range);
if (!boundary_comparison_or_error.is_error() && boundary_comparison_or_error.value() >= 0) {
// If the match occurs after the current selection then we don't need to increment the match index later on.
if (boundary_comparison_or_error.value() && direction == SearchDirection::Forward)
direction = {};
return i;
}
}
return 0;
};
for (auto document : documents_in_active_window()) {
auto matches = document->find_matching_text(query.string, query.case_sensitivity);
if (document == top_level_traversable()->active_document()) {
auto new_match_index = find_current_match_index(*document, matches);
m_find_in_page_match_index = new_match_index + all_matches.size();
}
all_matches.extend(move(matches));
}
@ -611,17 +644,18 @@ Page::FindInPageResult Page::find_in_page(FindInPageQuery const& query)
if (!top_level_traversable_is_initialized())
return {};
m_find_in_page_match_index = 0;
m_last_find_in_page_query = query;
m_last_find_in_page_url = top_level_traversable()->active_document()->url();
if (query.string.is_empty()) {
m_last_find_in_page_query = {};
clear_selection();
return {};
}
return perform_find_in_page_query(query);
auto result = perform_find_in_page_query(query);
m_last_find_in_page_query = query;
m_last_find_in_page_url = top_level_traversable()->active_document()->url();
return result;
}
Page::FindInPageResult Page::find_in_page_next_match()