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

LibWeb: Convert CheckBox to be a LabelableNode

Browse source
This commit is contained in:
Timothy Flynn 2021-04-04 11:51:36 -04:00 • committed by Andreas Kling
parent 26c9769247
commit e074fc70e1
2 changed files with 46 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Userland/Libraries/LibWeb/Layout/CheckBox.cpp
View file

@ -29,12 +29,13 @@
#include <LibGfx/Painter.h>
#include <LibGfx/StylePainter.h>
#include <LibWeb/Layout/CheckBox.h>
#include <LibWeb/Layout/Label.h>
#include <LibWeb/Page/Frame.h>
namespace Web::Layout {
CheckBox::CheckBox(DOM::Document& document, HTML::HTMLInputElement& element, NonnullRefPtr<CSS::StyleProperties> style)
: ReplacedBox(document, element, move(style))
: LabelableNode(document, element, move(style))
{
set_has_intrinsic_width(true);
set_has_intrinsic_height(true);
@ -51,7 +52,7 @@ void CheckBox::paint(PaintContext& context, PaintPhase phase)
if (!is_visible())
return;
ReplacedBox::paint(context, phase);
LabelableNode::paint(context, phase);
if (phase == PaintPhase::Foreground) {
Gfx::StylePainter::paint_check_box(context.painter(), enclosing_int_rect(absolute_rect()), context.palette(), dom_node().enabled(), dom_node().checked(), m_being_pressed);
@ -78,8 +79,11 @@ void CheckBox::handle_mouseup(Badge<EventHandler>, const Gfx::IntPoint& position
// NOTE: Changing the checked state of the DOM node may run arbitrary JS, which could disappear this node.
NonnullRefPtr protect = *this;
bool is_inside = enclosing_int_rect(absolute_rect()).contains(position);
if (is_inside)
bool is_inside_node_or_label = enclosing_int_rect(absolute_rect()).contains(position);
if (!is_inside_node_or_label)
is_inside_node_or_label = Label::is_inside_associated_label(*this, position);
if (is_inside_node_or_label)
dom_node().set_checked(!dom_node().checked());
m_being_pressed = false;
@ -92,11 +96,38 @@ void CheckBox::handle_mousemove(Badge<EventHandler>, const Gfx::IntPoint& positi
if (!m_tracking_mouse || !dom_node().enabled())
return;
bool is_inside = enclosing_int_rect(absolute_rect()).contains(position);
if (m_being_pressed == is_inside)
bool is_inside_node_or_label = enclosing_int_rect(absolute_rect()).contains(position);
if (!is_inside_node_or_label)
is_inside_node_or_label = Label::is_inside_associated_label(*this, position);
if (m_being_pressed == is_inside_node_or_label)
return;
m_being_pressed = is_inside;
m_being_pressed = is_inside_node_or_label;
set_needs_display();
}
void CheckBox::handle_associated_label_mousedown(Badge<Label>)
{
m_being_pressed = true;
set_needs_display();
}
void CheckBox::handle_associated_label_mouseup(Badge<Label>)
{
// NOTE: Changing the checked state of the DOM node may run arbitrary JS, which could disappear this node.
NonnullRefPtr protect = *this;
dom_node().set_checked(!dom_node().checked());
m_being_pressed = false;
}
void CheckBox::handle_associated_label_mousemove(Badge<Label>, bool is_inside_node_or_label)
{
if (m_being_pressed == is_inside_node_or_label)
return;
m_being_pressed = is_inside_node_or_label;
set_needs_display();
}

12
Userland/Libraries/LibWeb/Layout/CheckBox.h
View file

@ -27,19 +27,19 @@
#pragma once
#include <LibWeb/HTML/HTMLInputElement.h>
#include <LibWeb/Layout/ReplacedBox.h>
#include <LibWeb/Layout/LabelableNode.h>
namespace Web::Layout {
class CheckBox : public ReplacedBox {
class CheckBox : public LabelableNode {
public:
CheckBox(DOM::Document&, HTML::HTMLInputElement&, NonnullRefPtr<CSS::StyleProperties>);
virtual ~CheckBox() override;
virtual void paint(PaintContext&, PaintPhase) override;
const HTML::HTMLInputElement& dom_node() const { return static_cast<const HTML::HTMLInputElement&>(ReplacedBox::dom_node()); }
HTML::HTMLInputElement& dom_node() { return static_cast<HTML::HTMLInputElement&>(ReplacedBox::dom_node()); }
const HTML::HTMLInputElement& dom_node() const { return static_cast<const HTML::HTMLInputElement&>(LabelableNode::dom_node()); }
HTML::HTMLInputElement& dom_node() { return static_cast<HTML::HTMLInputElement&>(LabelableNode::dom_node()); }
private:
virtual bool wants_mouse_events() const override { return true; }
@ -47,6 +47,10 @@ private:
virtual void handle_mouseup(Badge<EventHandler>, const Gfx::IntPoint&, unsigned button, unsigned modifiers) override;
virtual void handle_mousemove(Badge<EventHandler>, const Gfx::IntPoint&, unsigned buttons, unsigned modifiers) override;
virtual void handle_associated_label_mousedown(Badge<Label>) override;
virtual void handle_associated_label_mouseup(Badge<Label>) override;
virtual void handle_associated_label_mousemove(Badge<Label>, bool is_inside_node_or_label) override;
bool m_being_pressed { false };
bool m_tracking_mouse { false };
};