mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-22 15:40:19 +00:00
LibWeb: Add stroke-linecap attribute and plumb it to SVGGraphicsElement
SVGGraphicsElement then goes ahead and does nothing with it for now.
This commit is contained in:
parent
202bfabdc6
commit
cc0cfd044b
Notes:
github-actions[bot]
2024-10-10 23:28:42 +00:00
Author: https://github.com/nico Commit: https://github.com/LadybirdBrowser/ladybird/commit/cc0cfd044b3 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1714 Reviewed-by: https://github.com/AtkinsSJ ✅
11 changed files with 41 additions and 1 deletions
|
@ -31,6 +31,7 @@ math-style: normal
|
||||||
pointer-events: auto
|
pointer-events: auto
|
||||||
quotes: auto
|
quotes: auto
|
||||||
stroke: none
|
stroke: none
|
||||||
|
stroke-linecap: butt
|
||||||
stroke-opacity: 1
|
stroke-opacity: 1
|
||||||
stroke-width: 1px
|
stroke-width: 1px
|
||||||
tab-size: 8
|
tab-size: 8
|
||||||
|
@ -120,7 +121,7 @@ grid-row-start: auto
|
||||||
grid-template-areas:
|
grid-template-areas:
|
||||||
grid-template-columns:
|
grid-template-columns:
|
||||||
grid-template-rows:
|
grid-template-rows:
|
||||||
height: 2074px
|
height: 2091px
|
||||||
inline-size: auto
|
inline-size: auto
|
||||||
inset-block-end: auto
|
inset-block-end: auto
|
||||||
inset-block-start: auto
|
inset-block-start: auto
|
||||||
|
|
|
@ -144,6 +144,7 @@ public:
|
||||||
static float fill_opacity() { return 1.0f; }
|
static float fill_opacity() { return 1.0f; }
|
||||||
static CSS::FillRule fill_rule() { return CSS::FillRule::Nonzero; }
|
static CSS::FillRule fill_rule() { return CSS::FillRule::Nonzero; }
|
||||||
static CSS::ClipRule clip_rule() { return CSS::ClipRule::Nonzero; }
|
static CSS::ClipRule clip_rule() { return CSS::ClipRule::Nonzero; }
|
||||||
|
static CSS::StrokeLinecap stroke_linecap() { return CSS::StrokeLinecap::Butt; }
|
||||||
static float stroke_opacity() { return 1.0f; }
|
static float stroke_opacity() { return 1.0f; }
|
||||||
static float stop_opacity() { return 1.0f; }
|
static float stop_opacity() { return 1.0f; }
|
||||||
static CSS::TextAnchor text_anchor() { return CSS::TextAnchor::Start; }
|
static CSS::TextAnchor text_anchor() { return CSS::TextAnchor::Start; }
|
||||||
|
@ -464,6 +465,7 @@ public:
|
||||||
CSS::FillRule fill_rule() const { return m_inherited.fill_rule; }
|
CSS::FillRule fill_rule() const { return m_inherited.fill_rule; }
|
||||||
Optional<SVGPaint> const& stroke() const { return m_inherited.stroke; }
|
Optional<SVGPaint> const& stroke() const { return m_inherited.stroke; }
|
||||||
float fill_opacity() const { return m_inherited.fill_opacity; }
|
float fill_opacity() const { return m_inherited.fill_opacity; }
|
||||||
|
CSS::StrokeLinecap stroke_linecap() const { return m_inherited.stroke_linecap; }
|
||||||
float stroke_opacity() const { return m_inherited.stroke_opacity; }
|
float stroke_opacity() const { return m_inherited.stroke_opacity; }
|
||||||
LengthPercentage const& stroke_width() const { return m_inherited.stroke_width; }
|
LengthPercentage const& stroke_width() const { return m_inherited.stroke_width; }
|
||||||
Color stop_color() const { return m_noninherited.stop_color; }
|
Color stop_color() const { return m_noninherited.stop_color; }
|
||||||
|
@ -555,6 +557,7 @@ protected:
|
||||||
CSS::FillRule fill_rule { InitialValues::fill_rule() };
|
CSS::FillRule fill_rule { InitialValues::fill_rule() };
|
||||||
Optional<SVGPaint> stroke;
|
Optional<SVGPaint> stroke;
|
||||||
float fill_opacity { InitialValues::fill_opacity() };
|
float fill_opacity { InitialValues::fill_opacity() };
|
||||||
|
CSS::StrokeLinecap stroke_linecap { InitialValues::stroke_linecap() };
|
||||||
float stroke_opacity { InitialValues::stroke_opacity() };
|
float stroke_opacity { InitialValues::stroke_opacity() };
|
||||||
LengthPercentage stroke_width { Length::make_px(1) };
|
LengthPercentage stroke_width { Length::make_px(1) };
|
||||||
CSS::TextAnchor text_anchor { InitialValues::text_anchor() };
|
CSS::TextAnchor text_anchor { InitialValues::text_anchor() };
|
||||||
|
@ -791,6 +794,7 @@ public:
|
||||||
void set_stroke(SVGPaint value) { m_inherited.stroke = value; }
|
void set_stroke(SVGPaint value) { m_inherited.stroke = value; }
|
||||||
void set_fill_rule(CSS::FillRule value) { m_inherited.fill_rule = value; }
|
void set_fill_rule(CSS::FillRule value) { m_inherited.fill_rule = value; }
|
||||||
void set_fill_opacity(float value) { m_inherited.fill_opacity = value; }
|
void set_fill_opacity(float value) { m_inherited.fill_opacity = value; }
|
||||||
|
void set_stroke_linecap(CSS::StrokeLinecap value) { m_inherited.stroke_linecap = value; }
|
||||||
void set_stroke_opacity(float value) { m_inherited.stroke_opacity = value; }
|
void set_stroke_opacity(float value) { m_inherited.stroke_opacity = value; }
|
||||||
void set_stroke_width(LengthPercentage value) { m_inherited.stroke_width = value; }
|
void set_stroke_width(LengthPercentage value) { m_inherited.stroke_width = value; }
|
||||||
void set_stop_color(Color value) { m_noninherited.stop_color = value; }
|
void set_stop_color(Color value) { m_noninherited.stop_color = value; }
|
||||||
|
|
|
@ -417,6 +417,11 @@
|
||||||
"thin",
|
"thin",
|
||||||
"none"
|
"none"
|
||||||
],
|
],
|
||||||
|
"stroke-linecap": [
|
||||||
|
"butt",
|
||||||
|
"square",
|
||||||
|
"round"
|
||||||
|
],
|
||||||
"text-align": [
|
"text-align": [
|
||||||
"center",
|
"center",
|
||||||
"justify",
|
"justify",
|
||||||
|
|
|
@ -90,6 +90,7 @@
|
||||||
"bottom",
|
"bottom",
|
||||||
"break-word",
|
"break-word",
|
||||||
"browser",
|
"browser",
|
||||||
|
"butt",
|
||||||
"button",
|
"button",
|
||||||
"buttonborder",
|
"buttonborder",
|
||||||
"buttonface",
|
"buttonface",
|
||||||
|
|
|
@ -2418,6 +2418,15 @@
|
||||||
"paint"
|
"paint"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"stroke-linecap": {
|
||||||
|
"affects-layout": false,
|
||||||
|
"animation-type": "discrete",
|
||||||
|
"inherited": true,
|
||||||
|
"initial": "butt",
|
||||||
|
"valid-types": [
|
||||||
|
"stroke-linecap"
|
||||||
|
]
|
||||||
|
},
|
||||||
"stroke-opacity": {
|
"stroke-opacity": {
|
||||||
"affects-layout": false,
|
"affects-layout": false,
|
||||||
"animation-type": "by-computed-value",
|
"animation-type": "by-computed-value",
|
||||||
|
|
|
@ -326,6 +326,12 @@ float StyleProperties::fill_opacity() const
|
||||||
return resolve_opacity_value(*value);
|
return resolve_opacity_value(*value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Optional<CSS::StrokeLinecap> StyleProperties::stroke_linecap() const
|
||||||
|
{
|
||||||
|
auto value = property(CSS::PropertyID::StrokeLinecap);
|
||||||
|
return keyword_to_stroke_linecap(value->to_keyword());
|
||||||
|
}
|
||||||
|
|
||||||
float StyleProperties::stroke_opacity() const
|
float StyleProperties::stroke_opacity() const
|
||||||
{
|
{
|
||||||
auto value = property(CSS::PropertyID::StrokeOpacity);
|
auto value = property(CSS::PropertyID::StrokeOpacity);
|
||||||
|
|
|
@ -177,6 +177,7 @@ public:
|
||||||
Color stop_color() const;
|
Color stop_color() const;
|
||||||
float stop_opacity() const;
|
float stop_opacity() const;
|
||||||
float fill_opacity() const;
|
float fill_opacity() const;
|
||||||
|
Optional<CSS::StrokeLinecap> stroke_linecap() const;
|
||||||
float stroke_opacity() const;
|
float stroke_opacity() const;
|
||||||
Optional<CSS::FillRule> fill_rule() const;
|
Optional<CSS::FillRule> fill_rule() const;
|
||||||
Optional<CSS::ClipRule> clip_rule() const;
|
Optional<CSS::ClipRule> clip_rule() const;
|
||||||
|
|
|
@ -840,6 +840,8 @@ void NodeWithStyle::apply_style(const CSS::StyleProperties& computed_style)
|
||||||
computed_values.set_fill_rule(*fill_rule);
|
computed_values.set_fill_rule(*fill_rule);
|
||||||
|
|
||||||
computed_values.set_fill_opacity(computed_style.fill_opacity());
|
computed_values.set_fill_opacity(computed_style.fill_opacity());
|
||||||
|
if (auto stroke_linecap = computed_style.stroke_linecap(); stroke_linecap.has_value())
|
||||||
|
computed_values.set_stroke_linecap(stroke_linecap.value());
|
||||||
computed_values.set_stroke_opacity(computed_style.stroke_opacity());
|
computed_values.set_stroke_opacity(computed_style.stroke_opacity());
|
||||||
computed_values.set_stop_opacity(computed_style.stop_opacity());
|
computed_values.set_stop_opacity(computed_style.stop_opacity());
|
||||||
|
|
||||||
|
|
|
@ -132,6 +132,9 @@ void SVGPathPaintable::paint(PaintContext& context, PaintPhase phase) const
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
auto stroke_linecap = graphics_element.stroke_linecap().value_or(CSS::StrokeLinecap::Butt);
|
||||||
|
(void)stroke_linecap; // FIXME: Use
|
||||||
|
|
||||||
auto stroke_opacity = graphics_element.stroke_opacity().value_or(1);
|
auto stroke_opacity = graphics_element.stroke_opacity().value_or(1);
|
||||||
|
|
||||||
// Note: This is assuming .x_scale() == .y_scale() (which it does currently).
|
// Note: This is assuming .x_scale() == .y_scale() (which it does currently).
|
||||||
|
|
|
@ -234,6 +234,13 @@ Optional<float> SVGGraphicsElement::fill_opacity() const
|
||||||
return layout_node()->computed_values().fill_opacity();
|
return layout_node()->computed_values().fill_opacity();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Optional<CSS::StrokeLinecap> SVGGraphicsElement::stroke_linecap() const
|
||||||
|
{
|
||||||
|
if (!layout_node())
|
||||||
|
return {};
|
||||||
|
return layout_node()->computed_values().stroke_linecap();
|
||||||
|
}
|
||||||
|
|
||||||
Optional<float> SVGGraphicsElement::stroke_opacity() const
|
Optional<float> SVGGraphicsElement::stroke_opacity() const
|
||||||
{
|
{
|
||||||
if (!layout_node())
|
if (!layout_node())
|
||||||
|
|
|
@ -38,6 +38,7 @@ public:
|
||||||
Optional<Gfx::Color> stroke_color() const;
|
Optional<Gfx::Color> stroke_color() const;
|
||||||
Optional<float> stroke_width() const;
|
Optional<float> stroke_width() const;
|
||||||
Optional<float> fill_opacity() const;
|
Optional<float> fill_opacity() const;
|
||||||
|
Optional<CSS::StrokeLinecap> stroke_linecap() const;
|
||||||
Optional<float> stroke_opacity() const;
|
Optional<float> stroke_opacity() const;
|
||||||
Optional<FillRule> fill_rule() const;
|
Optional<FillRule> fill_rule() const;
|
||||||
Optional<ClipRule> clip_rule() const;
|
Optional<ClipRule> clip_rule() const;
|
||||||
|
|
Loading…
Reference in a new issue