mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 04:17:35 +00:00
LibWeb: Layout SVG <text> elements during layout (not while painting)
Previously, all SVG <text> elements were zero-sized boxes, that were only actually positioned and sized during painting. This led to a number of problems, the most visible of which being that text could not be scaled based on the viewBox. Which this patch, <text> elements get a correctly sized layout box, that can be hit-tested and respects the SVG viewBox. To share code with SVGGeometryElement's the PathData (from the prior commit) has been split into a computed path and computed transforms. The computed path is specific to geometry elements, but the computed transforms are shared between all SVG graphics elements.
This commit is contained in:
parent
dc9cb449b1
commit
c93d367d95
16 changed files with 209 additions and 173 deletions
|
@ -15,6 +15,36 @@ class SVGGraphicsPaintable : public SVGPaintable {
|
|||
JS_CELL(SVGGraphicsPaintable, SVGPaintable);
|
||||
|
||||
public:
|
||||
class ComputedTransforms {
|
||||
public:
|
||||
ComputedTransforms(Gfx::AffineTransform svg_to_viewbox_transform, Gfx::AffineTransform svg_transform)
|
||||
: m_svg_to_viewbox_transform(svg_to_viewbox_transform)
|
||||
, m_svg_transform(svg_transform)
|
||||
{
|
||||
}
|
||||
|
||||
ComputedTransforms() = default;
|
||||
|
||||
Gfx::AffineTransform const& svg_to_viewbox_transform() const { return m_svg_to_viewbox_transform; }
|
||||
Gfx::AffineTransform const& svg_transform() const { return m_svg_transform; }
|
||||
|
||||
Gfx::AffineTransform svg_to_css_pixels_transform(
|
||||
Optional<Gfx::AffineTransform const&> additional_svg_transform = {}) const
|
||||
{
|
||||
return Gfx::AffineTransform {}.multiply(svg_to_viewbox_transform()).multiply(additional_svg_transform.value_or(Gfx::AffineTransform {})).multiply(svg_transform());
|
||||
}
|
||||
|
||||
Gfx::AffineTransform svg_to_device_pixels_transform(PaintContext const& context) const
|
||||
{
|
||||
auto css_scale = context.device_pixels_per_css_pixel();
|
||||
return Gfx::AffineTransform {}.scale({ css_scale, css_scale }).multiply(svg_to_css_pixels_transform(context.svg_transform()));
|
||||
}
|
||||
|
||||
private:
|
||||
Gfx::AffineTransform m_svg_to_viewbox_transform {};
|
||||
Gfx::AffineTransform m_svg_transform {};
|
||||
};
|
||||
|
||||
static JS::NonnullGCPtr<SVGGraphicsPaintable> create(Layout::SVGGraphicsBox const&);
|
||||
|
||||
Layout::SVGGraphicsBox const& layout_box() const;
|
||||
|
@ -25,8 +55,20 @@ public:
|
|||
virtual Optional<Gfx::Bitmap::MaskKind> get_mask_type() const override;
|
||||
virtual RefPtr<Gfx::Bitmap> calculate_mask(PaintContext&, CSSPixelRect const& masking_area) const override;
|
||||
|
||||
void set_computed_transforms(ComputedTransforms computed_transforms)
|
||||
{
|
||||
m_computed_transforms = computed_transforms;
|
||||
}
|
||||
|
||||
ComputedTransforms const& computed_transforms() const
|
||||
{
|
||||
return m_computed_transforms;
|
||||
}
|
||||
|
||||
protected:
|
||||
SVGGraphicsPaintable(Layout::SVGGraphicsBox const&);
|
||||
|
||||
ComputedTransforms m_computed_transforms;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue