summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp
diff options
context:
space:
mode:
authorsin-ack <sin-ack@users.noreply.github.com>2022-03-14 23:05:55 +0000
committerAndreas Kling <kling@serenityos.org>2022-03-16 00:38:31 +0100
commit29583104d220e4ea2d626781ef5c525fdf11974e (patch)
tree6a7e94958f4c298147168457b62616a0a21e4d9e /Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp
parent06ccc451577cc3f55bd10ce4c88f9fdf471e5129 (diff)
downloadserenity-29583104d220e4ea2d626781ef5c525fdf11974e.zip
LibWeb: Refactor all LabelableNode subclasses + input event handling :^)
This commit is messy due to the Paintable and Layout classes being tangled together. The RadioButton, CheckBox and ButtonBox classes are now subclasses of FormAssociatedLabelableNode. This subclass separates these layout nodes from LabelableNode, which is also the superclass of non-form associated labelable nodes (Progress). ButtonPaintable, CheckBoxPaintable and RadioButtonPaintable no longer call events on DOM nodes directly from their mouse event handlers; instead, all the functionality is now directly in EventHandler, which dispatches the related events. handle_mousedown and related methods return a bool indicating whether the event handling should proceed. Paintable classes can now return an alternative DOM::Node which should be the target of the mouse event. Labels use this to indicate that the labeled control should be the target of the mouse events. HTMLInputElement put its activation behavior on run_activation_behavior, which wasn't actually called anywhere and had to be manually called by other places. We now use activation_behavior which is used by EventDispatcher. This commit also brings HTMLInputElement closer to spec by removing the did_foo functions that did ad-hoc event dispatching and unifies the behavior under run_input_activation_behavior.
Diffstat (limited to 'Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp')
-rw-r--r--Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp82
1 files changed, 4 insertions, 78 deletions
diff --git a/Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp b/Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp
index dd406293bb..63c1f33c40 100644
--- a/Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp
+++ b/Userland/Libraries/LibWeb/Painting/ButtonPaintable.cpp
@@ -40,87 +40,13 @@ void ButtonPaintable::paint(PaintContext& context, PaintPhase phase) const
PaintableBox::paint(context, phase);
- if (phase == PaintPhase::Foreground) {
+ auto const& dom_node = layout_box().dom_node();
+ if (is<HTML::HTMLInputElement>(dom_node) && phase == PaintPhase::Foreground) {
auto text_rect = enclosing_int_rect(absolute_rect());
- if (m_being_pressed)
+ if (being_pressed())
text_rect.translate_by(1, 1);
- context.painter().draw_text(text_rect, layout_box().dom_node().value(), layout_box().font(), Gfx::TextAlignment::Center, computed_values().color());
+ context.painter().draw_text(text_rect, static_cast<HTML::HTMLInputElement const&>(dom_node).value(), layout_box().font(), Gfx::TextAlignment::Center, computed_values().color());
}
}
-void ButtonPaintable::handle_mousedown(Badge<EventHandler>, const Gfx::IntPoint&, unsigned button, unsigned)
-{
- if (button != GUI::MouseButton::Primary || !layout_box().dom_node().enabled())
- return;
-
- m_being_pressed = true;
- set_needs_display();
-
- m_tracking_mouse = true;
- browsing_context().event_handler().set_mouse_event_tracking_layout_node(&layout_box());
-}
-
-void ButtonPaintable::handle_mouseup(Badge<EventHandler>, const Gfx::IntPoint& position, unsigned button, unsigned)
-{
- if (!m_tracking_mouse || button != GUI::MouseButton::Primary || !layout_box().dom_node().enabled())
- return;
-
- // NOTE: Handling the click may run arbitrary JS, which could disappear this node.
- NonnullRefPtr protected_this = *this;
- NonnullRefPtr protected_browsing_context = browsing_context();
-
- bool is_inside_node_or_label = enclosing_int_rect(absolute_rect()).contains(position);
- if (!is_inside_node_or_label)
- is_inside_node_or_label = Layout::Label::is_inside_associated_label(layout_box(), position);
-
- if (is_inside_node_or_label)
- const_cast<Layout::ButtonBox&>(layout_box()).dom_node().did_click_button({});
-
- m_being_pressed = false;
- m_tracking_mouse = false;
-
- protected_browsing_context->event_handler().set_mouse_event_tracking_layout_node(nullptr);
-}
-
-void ButtonPaintable::handle_mousemove(Badge<EventHandler>, const Gfx::IntPoint& position, unsigned, unsigned)
-{
- if (!m_tracking_mouse || !layout_box().dom_node().enabled())
- return;
-
- bool is_inside_node_or_label = enclosing_int_rect(absolute_rect()).contains(position);
- if (!is_inside_node_or_label)
- is_inside_node_or_label = Layout::Label::is_inside_associated_label(layout_box(), position);
-
- if (m_being_pressed == is_inside_node_or_label)
- return;
-
- m_being_pressed = is_inside_node_or_label;
- set_needs_display();
-}
-
-void ButtonPaintable::handle_associated_label_mousedown(Badge<Layout::Label>)
-{
- m_being_pressed = true;
- set_needs_display();
-}
-
-void ButtonPaintable::handle_associated_label_mouseup(Badge<Layout::Label>)
-{
- // NOTE: Handling the click may run arbitrary JS, which could disappear this node.
- NonnullRefPtr protected_this = *this;
- NonnullRefPtr protected_browsing_context = browsing_context();
-
- layout_box().dom_node().did_click_button({});
- m_being_pressed = false;
-}
-
-void ButtonPaintable::handle_associated_label_mousemove(Badge<Layout::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();
-}
-
}