mirror of
https://github.com/RGBCube/serenity
synced 2025-06-28 21:22:08 +00:00
LibWeb: Remove WidgetBox layout node
The approach of attaching sub-widgets to the web view widget was only ever going to work in single-process mode, and that's not what we're about anymore, so let's just get rid of WidgetBox so we don't have the dead-end architecture hanging over us. The next step here is to re-implement <input type=text> using LibWeb primitives.
This commit is contained in:
parent
1ad65b173b
commit
5e91e61900
10 changed files with 2 additions and 172 deletions
|
@ -172,7 +172,6 @@ set(SOURCES
|
||||||
Layout/TableRowGroupBox.cpp
|
Layout/TableRowGroupBox.cpp
|
||||||
Layout/TextNode.cpp
|
Layout/TextNode.cpp
|
||||||
Layout/TreeBuilder.cpp
|
Layout/TreeBuilder.cpp
|
||||||
Layout/WidgetBox.cpp
|
|
||||||
LayoutTreeModel.cpp
|
LayoutTreeModel.cpp
|
||||||
Loader/ContentFilter.cpp
|
Loader/ContentFilter.cpp
|
||||||
Loader/FrameLoader.cpp
|
Loader/FrameLoader.cpp
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
#include <LibWeb/Layout/TableRowBox.h>
|
#include <LibWeb/Layout/TableRowBox.h>
|
||||||
#include <LibWeb/Layout/TableRowGroupBox.h>
|
#include <LibWeb/Layout/TableRowGroupBox.h>
|
||||||
#include <LibWeb/Layout/TreeBuilder.h>
|
#include <LibWeb/Layout/TreeBuilder.h>
|
||||||
#include <LibWeb/Layout/WidgetBox.h>
|
|
||||||
#include <LibWeb/Namespace.h>
|
#include <LibWeb/Namespace.h>
|
||||||
|
|
||||||
namespace Web::DOM {
|
namespace Web::DOM {
|
||||||
|
@ -221,10 +220,6 @@ void Element::recompute_style()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't bother with style on widgets. NATIVE LOOK & FEEL BABY!
|
|
||||||
if (is<Layout::WidgetBox>(layout_node()))
|
|
||||||
return;
|
|
||||||
|
|
||||||
auto diff = StyleDifference::NeedsRelayout;
|
auto diff = StyleDifference::NeedsRelayout;
|
||||||
if (old_specified_css_values)
|
if (old_specified_css_values)
|
||||||
diff = compute_style_difference(*old_specified_css_values, *new_specified_css_values, document());
|
diff = compute_style_difference(*old_specified_css_values, *new_specified_css_values, document());
|
||||||
|
|
|
@ -24,8 +24,6 @@
|
||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <LibGUI/Button.h>
|
|
||||||
#include <LibGUI/TextBox.h>
|
|
||||||
#include <LibGfx/FontDatabase.h>
|
#include <LibGfx/FontDatabase.h>
|
||||||
#include <LibWeb/DOM/Document.h>
|
#include <LibWeb/DOM/Document.h>
|
||||||
#include <LibWeb/DOM/Event.h>
|
#include <LibWeb/DOM/Event.h>
|
||||||
|
@ -35,7 +33,6 @@
|
||||||
#include <LibWeb/InProcessWebView.h>
|
#include <LibWeb/InProcessWebView.h>
|
||||||
#include <LibWeb/Layout/ButtonBox.h>
|
#include <LibWeb/Layout/ButtonBox.h>
|
||||||
#include <LibWeb/Layout/CheckBox.h>
|
#include <LibWeb/Layout/CheckBox.h>
|
||||||
#include <LibWeb/Layout/WidgetBox.h>
|
|
||||||
#include <LibWeb/Page/Frame.h>
|
#include <LibWeb/Page/Frame.h>
|
||||||
|
|
||||||
namespace Web::HTML {
|
namespace Web::HTML {
|
||||||
|
@ -64,10 +61,6 @@ void HTMLInputElement::did_click_button(Badge<Layout::ButtonBox>)
|
||||||
|
|
||||||
RefPtr<Layout::Node> HTMLInputElement::create_layout_node()
|
RefPtr<Layout::Node> HTMLInputElement::create_layout_node()
|
||||||
{
|
{
|
||||||
ASSERT(document().page());
|
|
||||||
auto& page = *document().page();
|
|
||||||
auto& page_view = const_cast<InProcessWebView&>(static_cast<const InProcessWebView&>(page.client()));
|
|
||||||
|
|
||||||
if (type() == "hidden")
|
if (type() == "hidden")
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
|
@ -82,24 +75,7 @@ RefPtr<Layout::Node> HTMLInputElement::create_layout_node()
|
||||||
return adopt(*new Layout::CheckBox(document(), *this, move(style)));
|
return adopt(*new Layout::CheckBox(document(), *this, move(style)));
|
||||||
|
|
||||||
// FIXME: Implement <input type=text> in terms of LibWeb primitives.
|
// FIXME: Implement <input type=text> in terms of LibWeb primitives.
|
||||||
if (page.client().is_multi_process())
|
return nullptr;
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
auto& text_box = page_view.add<GUI::TextBox>();
|
|
||||||
text_box.set_text(value());
|
|
||||||
text_box.on_change = [this] {
|
|
||||||
auto& widget = downcast<Layout::WidgetBox>(layout_node())->widget();
|
|
||||||
const_cast<HTMLInputElement*>(this)->set_attribute(HTML::AttributeNames::value, static_cast<const GUI::TextBox&>(widget).text());
|
|
||||||
};
|
|
||||||
int text_width = Gfx::FontDatabase::default_font().width(value());
|
|
||||||
auto size_value = attribute(HTML::AttributeNames::size);
|
|
||||||
if (!size_value.is_null()) {
|
|
||||||
auto size = size_value.to_uint();
|
|
||||||
if (size.has_value())
|
|
||||||
text_width = Gfx::FontDatabase::default_font().glyph_width('x') * size.value();
|
|
||||||
}
|
|
||||||
text_box.set_relative_rect(0, 0, text_width + 20, 20);
|
|
||||||
return adopt(*new Layout::WidgetBox(document(), *this, text_box));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HTMLInputElement::set_checked(bool checked)
|
void HTMLInputElement::set_checked(bool checked)
|
||||||
|
|
|
@ -401,7 +401,6 @@ void InProcessWebView::set_document(DOM::Document* document)
|
||||||
void InProcessWebView::did_scroll()
|
void InProcessWebView::did_scroll()
|
||||||
{
|
{
|
||||||
page().main_frame().set_viewport_scroll_offset({ horizontal_scrollbar().value(), vertical_scrollbar().value() });
|
page().main_frame().set_viewport_scroll_offset({ horizontal_scrollbar().value(), vertical_scrollbar().value() });
|
||||||
page().main_frame().did_scroll({});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void InProcessWebView::drop_event(GUI::DropEvent& event)
|
void InProcessWebView::drop_event(GUI::DropEvent& event)
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <LibWeb/Layout/InitialContainingBlockBox.h>
|
#include <LibWeb/Layout/InitialContainingBlockBox.h>
|
||||||
#include <LibWeb/Layout/InlineFormattingContext.h>
|
#include <LibWeb/Layout/InlineFormattingContext.h>
|
||||||
#include <LibWeb/Layout/ListItemBox.h>
|
#include <LibWeb/Layout/ListItemBox.h>
|
||||||
#include <LibWeb/Layout/WidgetBox.h>
|
#include <LibWeb/Layout/ReplacedBox.h>
|
||||||
#include <LibWeb/Page/Frame.h>
|
#include <LibWeb/Page/Frame.h>
|
||||||
|
|
||||||
namespace Web::Layout {
|
namespace Web::Layout {
|
||||||
|
@ -481,13 +481,6 @@ void BlockFormattingContext::layout_initial_containing_block(LayoutMode layout_m
|
||||||
|
|
||||||
// FIXME: This is a hack and should be managed by an overflow mechanism.
|
// FIXME: This is a hack and should be managed by an overflow mechanism.
|
||||||
icb.set_height(max(static_cast<float>(viewport_rect.height()), lowest_bottom));
|
icb.set_height(max(static_cast<float>(viewport_rect.height()), lowest_bottom));
|
||||||
|
|
||||||
// FIXME: This is a total hack. Make sure any GUI::Widgets are moved into place after layout.
|
|
||||||
// We should stop embedding GUI::Widgets entirely, since that won't work out-of-process.
|
|
||||||
icb.for_each_in_subtree_of_type<Layout::WidgetBox>([&](auto& widget) {
|
|
||||||
widget.update_widget();
|
|
||||||
return IterationDecision::Continue;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Gfx::FloatRect rect_in_coordinate_space(const Box& box, const Box& context_box)
|
static Gfx::FloatRect rect_in_coordinate_space(const Box& box, const Box& context_box)
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
#include <LibWeb/Dump.h>
|
#include <LibWeb/Dump.h>
|
||||||
#include <LibWeb/Layout/InitialContainingBlockBox.h>
|
#include <LibWeb/Layout/InitialContainingBlockBox.h>
|
||||||
#include <LibWeb/Layout/WidgetBox.h>
|
|
||||||
#include <LibWeb/Page/Frame.h>
|
#include <LibWeb/Page/Frame.h>
|
||||||
#include <LibWeb/Painting/StackingContext.h>
|
#include <LibWeb/Painting/StackingContext.h>
|
||||||
|
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
||||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <LibGUI/Painter.h>
|
|
||||||
#include <LibGUI/ScrollBar.h>
|
|
||||||
#include <LibGUI/Widget.h>
|
|
||||||
#include <LibWeb/DOM/Document.h>
|
|
||||||
#include <LibWeb/InProcessWebView.h>
|
|
||||||
#include <LibWeb/Layout/WidgetBox.h>
|
|
||||||
#include <LibWeb/Page/Frame.h>
|
|
||||||
|
|
||||||
namespace Web::Layout {
|
|
||||||
|
|
||||||
WidgetBox::WidgetBox(DOM::Document& document, DOM::Element& element, GUI::Widget& widget)
|
|
||||||
: ReplacedBox(document, element, CSS::StyleProperties::create())
|
|
||||||
, m_widget(widget)
|
|
||||||
{
|
|
||||||
set_has_intrinsic_width(true);
|
|
||||||
set_has_intrinsic_height(true);
|
|
||||||
set_intrinsic_width(widget.width());
|
|
||||||
set_intrinsic_height(widget.height());
|
|
||||||
}
|
|
||||||
|
|
||||||
WidgetBox::~WidgetBox()
|
|
||||||
{
|
|
||||||
widget().remove_from_parent();
|
|
||||||
}
|
|
||||||
|
|
||||||
void WidgetBox::did_set_rect()
|
|
||||||
{
|
|
||||||
ReplacedBox::did_set_rect();
|
|
||||||
update_widget();
|
|
||||||
}
|
|
||||||
|
|
||||||
void WidgetBox::update_widget()
|
|
||||||
{
|
|
||||||
auto adjusted_widget_position = absolute_rect().location().to_type<int>();
|
|
||||||
auto& page_view = static_cast<const InProcessWebView&>(frame().page()->client());
|
|
||||||
adjusted_widget_position.move_by(-page_view.horizontal_scrollbar().value(), -page_view.vertical_scrollbar().value());
|
|
||||||
widget().move_to(adjusted_widget_position);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,49 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
||||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <LibWeb/Layout/ReplacedBox.h>
|
|
||||||
|
|
||||||
namespace Web::Layout {
|
|
||||||
|
|
||||||
class WidgetBox final : public ReplacedBox {
|
|
||||||
public:
|
|
||||||
WidgetBox(DOM::Document&, DOM::Element&, GUI::Widget&);
|
|
||||||
virtual ~WidgetBox() override;
|
|
||||||
|
|
||||||
GUI::Widget& widget() { return m_widget; }
|
|
||||||
const GUI::Widget& widget() const { return m_widget; }
|
|
||||||
|
|
||||||
void update_widget();
|
|
||||||
|
|
||||||
private:
|
|
||||||
virtual void did_set_rect() override;
|
|
||||||
|
|
||||||
NonnullRefPtr<GUI::Widget> m_widget;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include <LibWeb/Layout/BreakNode.h>
|
#include <LibWeb/Layout/BreakNode.h>
|
||||||
#include <LibWeb/Layout/InitialContainingBlockBox.h>
|
#include <LibWeb/Layout/InitialContainingBlockBox.h>
|
||||||
#include <LibWeb/Layout/TextNode.h>
|
#include <LibWeb/Layout/TextNode.h>
|
||||||
#include <LibWeb/Layout/WidgetBox.h>
|
|
||||||
#include <LibWeb/Page/Frame.h>
|
#include <LibWeb/Page/Frame.h>
|
||||||
|
|
||||||
namespace Web {
|
namespace Web {
|
||||||
|
@ -167,18 +166,6 @@ void Frame::set_needs_display(const Gfx::IntRect& rect)
|
||||||
host_element()->layout_node()->set_needs_display();
|
host_element()->layout_node()->set_needs_display();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Frame::did_scroll(Badge<InProcessWebView>)
|
|
||||||
{
|
|
||||||
if (!m_document)
|
|
||||||
return;
|
|
||||||
if (!m_document->layout_node())
|
|
||||||
return;
|
|
||||||
m_document->layout_node()->for_each_in_subtree_of_type<Layout::WidgetBox>([&](auto& layout_widget) {
|
|
||||||
layout_widget.update_widget();
|
|
||||||
return IterationDecision::Continue;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void Frame::scroll_to_anchor(const String& fragment)
|
void Frame::scroll_to_anchor(const String& fragment)
|
||||||
{
|
{
|
||||||
if (!document())
|
if (!document())
|
||||||
|
|
|
@ -75,15 +75,12 @@ public:
|
||||||
Gfx::IntRect viewport_rect() const { return { m_viewport_scroll_offset, m_size }; }
|
Gfx::IntRect viewport_rect() const { return { m_viewport_scroll_offset, m_size }; }
|
||||||
void set_viewport_rect(const Gfx::IntRect&);
|
void set_viewport_rect(const Gfx::IntRect&);
|
||||||
|
|
||||||
void did_scroll(Badge<InProcessWebView>);
|
|
||||||
|
|
||||||
FrameLoader& loader() { return m_loader; }
|
FrameLoader& loader() { return m_loader; }
|
||||||
const FrameLoader& loader() const { return m_loader; }
|
const FrameLoader& loader() const { return m_loader; }
|
||||||
|
|
||||||
EventHandler& event_handler() { return m_event_handler; }
|
EventHandler& event_handler() { return m_event_handler; }
|
||||||
const EventHandler& event_handler() const { return m_event_handler; }
|
const EventHandler& event_handler() const { return m_event_handler; }
|
||||||
|
|
||||||
void scroll_to(const Gfx::IntPoint&);
|
|
||||||
void scroll_to_anchor(const String&);
|
void scroll_to_anchor(const String&);
|
||||||
|
|
||||||
Frame& main_frame() { return m_main_frame; }
|
Frame& main_frame() { return m_main_frame; }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue