RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 08:17:34 +00:00
Code Issues Activity Actions

Browser+LibHTML: Change the way computed styles are queried

Browse source
This commit is contained in:
Matrix89 2020-01-04 03:09:22 +01:00 • committed by Andreas Kling
parent 2ced4c4ec7
commit 2dd35916e5
4 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Applications/Browser/InspectorWidget.cpp
View file

@ -20,10 +20,10 @@ InspectorWidget::InspectorWidget(GWidget* parent)
node->document().set_inspected_node(node); node->document().set_inspected_node(node);
if (node->is_element()) { if (node->is_element()) {
auto element = to<Element>(*node); auto element = to<Element>(*node);
if (element.resolved_style()) if (element.resolved_style()) {
m_style_table_view->set_model(StylePropertiesModel::create(*element.resolved_style())); m_style_table_view->set_model(StylePropertiesModel::create(*element.resolved_style()));
if (element.layout_node() && element.layout_node()->has_style()) m_computed_style_table_view->set_model(StylePropertiesModel::create(*element.computed_style()));
m_computed_style_table_view->set_model(StylePropertiesModel::create(element.layout_node()->style())); }
} else { } else {
m_style_table_view->set_model(nullptr); m_style_table_view->set_model(nullptr);
m_computed_style_table_view->set_model(nullptr); m_computed_style_table_view->set_model(nullptr);

7
Libraries/LibHTML/CSS/StyleProperties.h
View file

@ -10,6 +10,13 @@ class Color;
class StyleProperties : public RefCounted<StyleProperties> { class StyleProperties : public RefCounted<StyleProperties> {
public: public:
static NonnullRefPtr<StyleProperties> create() { return adopt(*new StyleProperties); } static NonnullRefPtr<StyleProperties> create() { return adopt(*new StyleProperties); }
static NonnullRefPtr<StyleProperties> create(const StyleProperties& properties) {
auto style_properties = new StyleProperties();
properties.for_each_property([&](auto property_id, auto& property_value) {
style_properties->set_property(property_id, property_value);
});
return adopt(*style_properties);
}
template<typename Callback> template<typename Callback>
inline void for_each_property(Callback callback) const inline void for_each_property(Callback callback) const

25
Libraries/LibHTML/DOM/Element.cpp
View file

@ -1,4 +1,6 @@
#include <LibHTML/CSS/StyleResolver.h> #include <LibHTML/CSS/StyleResolver.h>
#include <LibHTML/CSS/PropertyID.h>
#include <LibHTML/CSS/Length.h>
#include <LibHTML/DOM/Document.h> #include <LibHTML/DOM/Document.h>
#include <LibHTML/DOM/Element.h> #include <LibHTML/DOM/Element.h>
#include <LibHTML/Layout/LayoutBlock.h> #include <LibHTML/Layout/LayoutBlock.h>
@ -160,3 +162,26 @@ void Element::recompute_style()
layout_node()->set_needs_display(); layout_node()->set_needs_display();
} }
} }
RefPtr<StyleProperties> Element::computed_style()
{
auto properties = StyleProperties::create(*m_resolved_style);
if (layout_node() && layout_node()->has_style()) {
CSS::PropertyID box_model_metrics[] = {
CSS::PropertyID::MarginTop,
CSS::PropertyID::MarginBottom,
CSS::PropertyID::MarginLeft,
CSS::PropertyID::MarginRight,
CSS::PropertyID::PaddingTop,
CSS::PropertyID::PaddingBottom,
CSS::PropertyID::PaddingLeft,
CSS::PropertyID::PaddingRight,
};
for (CSS::PropertyID id : box_model_metrics) {
auto prop = layout_node()->style().property(id);
if (prop)
properties->set_property(id, prop.value());
}
}
return properties.ptr();
}

1
Libraries/LibHTML/DOM/Element.h
View file

@ -57,6 +57,7 @@ public:
String name() const { return attribute("name"); } String name() const { return attribute("name"); }
const StyleProperties* resolved_style() const { return m_resolved_style.ptr(); } const StyleProperties* resolved_style() const { return m_resolved_style.ptr(); }
RefPtr<StyleProperties> computed_style();
private: private:
RefPtr<LayoutNode> create_layout_node(const StyleProperties* parent_style) const override; RefPtr<LayoutNode> create_layout_node(const StyleProperties* parent_style) const override;