RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-22 11:25:07 +00:00
Code Issues Activity Actions

LibHTML: Make hit testing work for LayoutText

Browse source 
LayoutText can't simply rely on its LayoutNode::rect() for hit testing.
Instead, we have to iterate over the individual runs and see if we're
hitting any of them.

Also, LayoutNode::hit_test() now always recurses into children, since
we can't trust the rect() to tell the truth (inline rects are wrong.)
This commit is contained in:
Andreas Kling 2019-09-29 11:32:00 +02:00
parent aac8b091a4
commit 13860e4dd8
3 changed files with 46 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibHTML/Layout/LayoutNode.cpp
View file

@ -1,7 +1,10 @@
#include <LibGUI/GPainter.h>
#include <LibHTML/DOM/Element.h>
#include <LibHTML/Layout/LayoutBlock.h>
#include <LibHTML/Layout/LayoutNode.h>
//#define DRAW_BOXES_AROUND_LAYOUT_NODES
LayoutNode::LayoutNode(const Node* node, StyleProperties&& style_properties)
: m_node(node)
, m_style_properties(style_properties)
@ -30,6 +33,9 @@ const LayoutBlock* LayoutNode::containing_block() const
void LayoutNode::render(RenderingContext& context)
{
#ifdef DRAW_BOXES_AROUND_LAYOUT_NODES
context.painter().draw_rect(m_rect, Color::Blue);
#endif
// TODO: render our background and border
for_each_child([&](auto& child) {
child.render(context);
@ -38,9 +44,10 @@ void LayoutNode::render(RenderingContext& context)
HitTestResult LayoutNode::hit_test(const Point& position) const
{
if (!m_rect.contains(position))
return {};
HitTestResult result { this };
// FIXME: It would be nice if we could confidently skip over hit testing
// parts of the layout tree, but currently we can't just check
// m_rect.contains() since inline text rects can't be trusted..
HitTestResult result { m_rect.contains(position) ? this : nullptr };
for_each_child([&](auto& child) {
auto child_result = child.hit_test(position);
if (child_result.layout_node)