RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:37:35 +00:00
Code Issues Activity Actions

LibWeb: Account for Calculated in Length methods

Browse source 
We were ignoring this in a couple of places.
This commit is contained in:
Sam Atkins 2022-02-21 17:35:52 +00:00 • committed by Andreas Kling
parent 64f112c4ea
commit a07fed4e53
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibWeb/CSS/Length.cpp
View file

@ -48,6 +48,8 @@ Length Length::make_calculated(NonnullRefPtr<CalculatedStyleValue> calculated_st
Length Length::percentage_of(Percentage const& percentage) const Length Length::percentage_of(Percentage const& percentage) const
{ {
VERIFY(!is_calculated());
if (is_auto()) { if (is_auto()) {
dbgln("Attempting to get percentage of an auto length, this seems wrong? But for now we just return the original length."); dbgln("Attempting to get percentage of an auto length, this seems wrong? But for now we just return the original length.");
return *this; return *this;
@ -104,6 +106,15 @@ float Length::to_px(Layout::Node const& layout_node) const
return to_px(viewport_rect, layout_node.font().metrics('M'), layout_node.computed_values().font_size(), root_element->layout_node()->computed_values().font_size()); return to_px(viewport_rect, layout_node.font().metrics('M'), layout_node.computed_values().font_size(), root_element->layout_node()->computed_values().font_size());
} }
String Length::to_string() const
{
if (is_calculated())
return m_calculated_style->to_string();
if (is_auto())
return "auto";
return String::formatted("{}{}", m_value, unit_name());
}
const char* Length::unit_name() const const char* Length::unit_name() const
{ {
switch (m_type) { switch (m_type) {

9
Userland/Libraries/LibWeb/CSS/Length.h
View file

@ -112,15 +112,12 @@ public:
} }
} }
String to_string() const String to_string() const;
{
if (is_auto())
return "auto";
return String::formatted("{}{}", m_value, unit_name());
}
bool operator==(const Length& other) const bool operator==(const Length& other) const
{ {
if (is_calculated())
return m_calculated_style == other.m_calculated_style;
return m_type == other.m_type && m_value == other.m_value; return m_type == other.m_type && m_value == other.m_value;
} }