fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-01-06 16:45:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Make hit testing return a { paintable, offset }

Browse Source 
Everything related to hit testing is better off using the painting tree.
The thing being mousemoved over is a paintable, so let's hand that out
directly instead of the corresponding layout node.
This commit is contained in:
Andreas Kling
2022-03-10 22:58:19 +01:00
parent cb0c5390ff
commit f017c1c064
5 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Userland/Libraries/LibWeb/Layout/BlockContainer.cpp
View File

@@ -42,16 +42,16 @@ HitTestResult BlockContainer::hit_test(const Gfx::IntPoint& position, HitTestTyp
if (enclosing_int_rect(fragment.absolute_rect()).contains(position)) {
if (is<BlockContainer>(fragment.layout_node()))
return verify_cast<BlockContainer>(fragment.layout_node()).hit_test(position, type);
return { fragment.layout_node(), fragment.text_index_at(position.x()) };
return { fragment.layout_node().paintable(), fragment.text_index_at(position.x()) };
}
if (fragment.absolute_rect().top() <= position.y())
last_good_candidate = { fragment.layout_node(), fragment.text_index_at(position.x()) };
last_good_candidate = { fragment.layout_node().paintable(), fragment.text_index_at(position.x()) };
}
}
if (type == HitTestType::TextCursor && last_good_candidate.layout_node)
if (type == HitTestType::TextCursor && last_good_candidate.paintable)
return last_good_candidate;
return { paint_box()->absolute_border_box_rect().contains(position.x(), position.y()) ? this : nullptr };
return { paint_box()->absolute_border_box_rect().contains(position.x(), position.y()) ? paintable() : nullptr };
}
bool BlockContainer::is_scrollable() const