OSSForks/ladybird
1
0
Fork 0
mirror of https://github.com/zebrajr/ladybird.git synced 2025-12-06 00:19:53 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

LibWeb: Add convenience from_style_value for LengthPercentage{OrAuto}

Browse Source
This commit is contained in:
Callum Law 2025-10-02 16:18:48 +13:00 committed by Sam Atkins
parent 4a998879d5
commit 309ff33278
3 changed files with 32 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Libraries/LibWeb/CSS/ComputedProperties.cpp
View File

@ -179,16 +179,7 @@ Variant<LengthPercentage, NormalGap> ComputedProperties::gap_value(PropertyID id
return NormalGap {};
}
if (value.is_calculated())
return LengthPercentage { value.as_calculated() };
if (value.is_percentage())
return LengthPercentage { value.as_percentage().percentage() };
if (value.is_length())
return LengthPercentage { value.as_length().length() };
VERIFY_NOT_REACHED();
return LengthPercentage::from_style_value(value);
}
Size ComputedProperties::size_value(PropertyID id) const
@ -674,17 +665,6 @@ Optional<Transformation> ComputedProperties::scale() const
return value.as_transformation().to_transformation();
}
static Optional<LengthPercentage> length_percentage_for_style_value(StyleValue const& value)
{
if (value.is_length())
return value.as_length().length();
if (value.is_percentage())
return value.as_percentage().percentage();
if (value.is_calculated())
return LengthPercentage { value.as_calculated() };
return {};
}
TransformBox ComputedProperties::transform_box() const
{
auto const& value = property(PropertyID::TransformBox);
@ -693,7 +673,7 @@ TransformBox ComputedProperties::transform_box() const
TransformOrigin ComputedProperties::transform_origin() const
{
auto length_percentage_with_keywords_resolved = [](StyleValue const& value) -> Optional<LengthPercentage> {
auto length_percentage_with_keywords_resolved = [](StyleValue const& value) -> LengthPercentage {
if (value.is_keyword()) {
auto keyword = value.to_keyword();
if (keyword == Keyword::Left || keyword == Keyword::Top)
@ -705,7 +685,7 @@ TransformOrigin ComputedProperties::transform_origin() const
VERIFY_NOT_REACHED();
}
return length_percentage_for_style_value(value);
return LengthPercentage::from_style_value(value);
};
auto const& value = property(PropertyID::TransformOrigin);
@ -715,10 +695,8 @@ TransformOrigin ComputedProperties::transform_origin() const
auto x_value = length_percentage_with_keywords_resolved(list.values()[0]);
auto y_value = length_percentage_with_keywords_resolved(list.values()[1]);
auto z_value = length_percentage_for_style_value(list.values()[2]);
if (!x_value.has_value() || !y_value.has_value() || !z_value.has_value())
return {};
return { x_value.value(), y_value.value(), z_value.value() };
auto z_value = LengthPercentage::from_style_value(list.values()[2]);
return { x_value, y_value, z_value };
}
Optional<Color> ComputedProperties::accent_color(Layout::NodeWithStyle const& node) const
@ -1222,13 +1200,8 @@ TextDecorationThickness ComputedProperties::text_decoration_thickness() const
VERIFY_NOT_REACHED();
}
}
if (value.is_length())
return TextDecorationThickness { LengthPercentage { value.as_length().length() } };
if (value.is_percentage())
return TextDecorationThickness { LengthPercentage { value.as_percentage().percentage() } };
if (value.is_calculated())
return TextDecorationThickness { LengthPercentage { value.as_calculated() } };
VERIFY_NOT_REACHED();
return TextDecorationThickness { LengthPercentage::from_style_value(value) };
}
TextTransform ComputedProperties::text_transform() const
@ -1356,16 +1329,7 @@ Variant<VerticalAlign, LengthPercentage> ComputedProperties::vertical_align() co
if (value.is_keyword())
return keyword_to_vertical_align(value.to_keyword()).release_value();
if (value.is_length())
return LengthPercentage(value.as_length().length());
if (value.is_percentage())
return LengthPercentage(value.as_percentage().percentage());
if (value.is_calculated())
return LengthPercentage { value.as_calculated() };
VERIFY_NOT_REACHED();
return LengthPercentage::from_style_value(value);
}
FontKerning ComputedProperties::font_kerning() const

18
Libraries/LibWeb/CSS/Interpolation.cpp
View File

@ -1330,13 +1330,7 @@ Optional<LengthPercentage> interpolate_length_percentage(CalculationContext cons
auto interpolated_style_value = interpolate_mixed_value(calculation_context, from_style_value, to_style_value, delta);
if (!interpolated_style_value)
return {};
if (interpolated_style_value->is_length())
return interpolated_style_value->as_length().length();
if (interpolated_style_value->is_percentage())
return interpolated_style_value->as_percentage().percentage();
if (interpolated_style_value->is_calculated())
return LengthPercentage { interpolated_style_value->as_calculated() };
VERIFY_NOT_REACHED();
return LengthPercentage::from_style_value(*interpolated_style_value);
}
Optional<LengthPercentageOrAuto> interpolate_length_percentage_or_auto(CalculationContext const& calculation_context, LengthPercentageOrAuto const& from, LengthPercentageOrAuto const& to, float delta)
@ -1353,15 +1347,7 @@ Optional<LengthPercentageOrAuto> interpolate_length_percentage_or_auto(Calculati
auto interpolated_style_value = interpolate_mixed_value(calculation_context, from_style_value, to_style_value, delta);
if (!interpolated_style_value)
return {};
if (interpolated_style_value->to_keyword() == Keyword::Auto)
return LengthPercentageOrAuto::make_auto();
if (interpolated_style_value->is_length())
return interpolated_style_value->as_length().length();
if (interpolated_style_value->is_percentage())
return interpolated_style_value->as_percentage().percentage();
if (interpolated_style_value->is_calculated())
return LengthPercentage { interpolated_style_value->as_calculated() };
VERIFY_NOT_REACHED();
return LengthPercentageOrAuto::from_style_value(*interpolated_style_value);
}
static RefPtr<StyleValue const> interpolate_value_impl(DOM::Element& element, CalculationContext const& calculation_context, StyleValue const& from, StyleValue const& to, float delta, AllowDiscrete allow_discrete)

22
Libraries/LibWeb/CSS/PercentageOr.h
View File

@ -14,6 +14,8 @@
#include <LibWeb/CSS/Number.h>
#include <LibWeb/CSS/Percentage.h>
#include <LibWeb/CSS/StyleValues/CalculatedStyleValue.h>
#include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
#include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
#include <LibWeb/CSS/Time.h>
namespace Web::CSS {
@ -208,6 +210,18 @@ class LengthPercentage : public PercentageOr<Length, LengthPercentage> {
public:
using PercentageOr<Length, LengthPercentage>::PercentageOr;
static LengthPercentage from_style_value(NonnullRefPtr<StyleValue const> const& style_value)
{
if (style_value->is_percentage())
return LengthPercentage { style_value->as_percentage().percentage() };
if (style_value->is_length())
return LengthPercentage { style_value->as_length().length() };
if (style_value->is_calculated())
return LengthPercentage { style_value->as_calculated() };
VERIFY_NOT_REACHED();
}
bool is_length() const { return is_t(); }
Length const& length() const { return get_t(); }
};
@ -234,6 +248,14 @@ public:
return LengthPercentageOrAuto();
}
static LengthPercentageOrAuto from_style_value(NonnullRefPtr<StyleValue const> const& style_value)
{
if (style_value->has_auto())
return LengthPercentageOrAuto::make_auto();
return LengthPercentage::from_style_value(style_value);
}
bool is_auto() const { return !m_length_percentage.has_value(); }
bool is_length() const { return m_length_percentage.has_value() && m_length_percentage->is_length(); }
bool is_percentage() const { return m_length_percentage.has_value() && m_length_percentage->is_percentage(); }