mirror of
https://github.com/RGBCube/serenity
synced 2025-05-30 21:58:10 +00:00
LibWeb: Support translate3d
This commit is contained in:
parent
f099e2aa12
commit
e4db71c88b
4 changed files with 36 additions and 1 deletions
|
@ -78,6 +78,7 @@ namespace Web::CSS {
|
||||||
generator.append(R"~~~(
|
generator.append(R"~~~(
|
||||||
enum class TransformFunctionParameterType {
|
enum class TransformFunctionParameterType {
|
||||||
Angle,
|
Angle,
|
||||||
|
Length,
|
||||||
LengthPercentage,
|
LengthPercentage,
|
||||||
Number,
|
Number,
|
||||||
};
|
};
|
||||||
|
@ -176,6 +177,8 @@ TransformFunctionMetadata transform_function_metadata(TransformFunction transfor
|
||||||
StringView parameter_type = ""sv;
|
StringView parameter_type = ""sv;
|
||||||
if (parameter_type_name == "angle"sv)
|
if (parameter_type_name == "angle"sv)
|
||||||
parameter_type = "Angle"sv;
|
parameter_type = "Angle"sv;
|
||||||
|
else if (parameter_type_name == "length"sv)
|
||||||
|
parameter_type = "Length"sv;
|
||||||
else if (parameter_type_name == "length-percentage"sv)
|
else if (parameter_type_name == "length-percentage"sv)
|
||||||
parameter_type = "LengthPercentage"sv;
|
parameter_type = "LengthPercentage"sv;
|
||||||
else if (parameter_type_name == "number"sv)
|
else if (parameter_type_name == "number"sv)
|
||||||
|
|
|
@ -5563,6 +5563,21 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& c
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case TransformFunctionParameterType::Length: {
|
||||||
|
if (maybe_calc_value && maybe_calc_value->resolves_to_length()) {
|
||||||
|
values.append(LengthStyleValue::create(Length::make_calculated(maybe_calc_value.release_nonnull())));
|
||||||
|
} else {
|
||||||
|
auto dimension_value = parse_dimension_value(value);
|
||||||
|
if (!dimension_value)
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
if (dimension_value->is_length())
|
||||||
|
values.append(dimension_value.release_nonnull());
|
||||||
|
else
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case TransformFunctionParameterType::LengthPercentage: {
|
case TransformFunctionParameterType::LengthPercentage: {
|
||||||
if (maybe_calc_value && maybe_calc_value->resolves_to_length()) {
|
if (maybe_calc_value && maybe_calc_value->resolves_to_length()) {
|
||||||
values.append(LengthStyleValue::create(Length::make_calculated(maybe_calc_value.release_nonnull())));
|
values.append(LengthStyleValue::create(Length::make_calculated(maybe_calc_value.release_nonnull())));
|
||||||
|
|
|
@ -35,6 +35,13 @@
|
||||||
{ "type": "<length-percentage>", "required": false }
|
{ "type": "<length-percentage>", "required": false }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"translate3d": {
|
||||||
|
"parameters": [
|
||||||
|
{ "type": "<length-percentage>", "required": true },
|
||||||
|
{ "type": "<length-percentage>", "required": true },
|
||||||
|
{ "type": "<length>", "required": true }
|
||||||
|
]
|
||||||
|
},
|
||||||
"translateX": {
|
"translateX": {
|
||||||
"parameters": [{ "type": "<length-percentage>", "required": true }]
|
"parameters": [{ "type": "<length-percentage>", "required": true }]
|
||||||
},
|
},
|
||||||
|
|
|
@ -209,7 +209,11 @@ Gfx::FloatMatrix4x4 StackingContext::get_transformation_matrix(CSS::Transformati
|
||||||
auto value = [this, transformation](size_t index, Optional<CSS::Length const&> reference_length = {}) -> float {
|
auto value = [this, transformation](size_t index, Optional<CSS::Length const&> reference_length = {}) -> float {
|
||||||
return transformation.values[index].visit(
|
return transformation.values[index].visit(
|
||||||
[this, reference_length](CSS::LengthPercentage const& value) {
|
[this, reference_length](CSS::LengthPercentage const& value) {
|
||||||
return value.resolved(m_box, reference_length.value()).to_px(m_box);
|
if (reference_length.has_value()) {
|
||||||
|
return value.resolved(m_box, reference_length.value()).to_px(m_box);
|
||||||
|
}
|
||||||
|
|
||||||
|
return value.length().to_px(m_box);
|
||||||
},
|
},
|
||||||
[](CSS::Angle const& value) {
|
[](CSS::Angle const& value) {
|
||||||
return value.to_degrees() * static_cast<float>(M_DEG2RAD);
|
return value.to_degrees() * static_cast<float>(M_DEG2RAD);
|
||||||
|
@ -250,6 +254,12 @@ Gfx::FloatMatrix4x4 StackingContext::get_transformation_matrix(CSS::Transformati
|
||||||
0, 0, 1, 0,
|
0, 0, 1, 0,
|
||||||
0, 0, 0, 1);
|
0, 0, 0, 1);
|
||||||
break;
|
break;
|
||||||
|
case CSS::TransformFunction::Translate3d:
|
||||||
|
return Gfx::FloatMatrix4x4(1, 0, 0, value(0, width),
|
||||||
|
0, 1, 0, value(1, height),
|
||||||
|
0, 0, 1, value(2),
|
||||||
|
0, 0, 0, 1);
|
||||||
|
break;
|
||||||
case CSS::TransformFunction::TranslateX:
|
case CSS::TransformFunction::TranslateX:
|
||||||
if (count == 1)
|
if (count == 1)
|
||||||
return Gfx::FloatMatrix4x4(1, 0, 0, value(0, width),
|
return Gfx::FloatMatrix4x4(1, 0, 0, value(0, width),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue