mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 19:57:35 +00:00
LibWeb: Add SVG <polygon>
element and test case :^)
This commit is contained in:
parent
116a1f485c
commit
2fad940b0b
10 changed files with 114 additions and 1 deletions
|
@ -11,7 +11,7 @@
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<svg width="800" height="1000">
|
||||
<svg width="800" height="1200">
|
||||
<path d="M 10 10 h 100 l -50 80 z" fill="green" stroke="black" stroke-width="3"></path>
|
||||
<path d="M 60 10 h 100 l -50 80 z" fill="red" stroke="blue" stroke-width="3"></path>
|
||||
<path d="M 110 10 h 100 l -50 80 z" class="css"></path>
|
||||
|
@ -75,6 +75,15 @@
|
|||
375,850 375,750 425,750 425,850
|
||||
475,850 475,725 525,725 525,850
|
||||
575,850" />
|
||||
|
||||
<!-- Based on https://svgwg.org/svg2-draft/shapes.html#PolygonElement -->
|
||||
<polygon fill="red" stroke="blue" stroke-width="10"
|
||||
points="150,875 179,961 269,961 197,1015
|
||||
223,1101 150,1050 77,1101 103,1015
|
||||
31,961 121,961" />
|
||||
<polygon fill="lime" stroke="blue" stroke-width="10"
|
||||
points="450,875 558,937.5 558,1062.5
|
||||
450,1125 342,1062.6 342,937.5" />
|
||||
</svg>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -86,6 +86,7 @@
|
|||
#include <LibWeb/Bindings/SVGEllipseElementWrapper.h>
|
||||
#include <LibWeb/Bindings/SVGLineElementWrapper.h>
|
||||
#include <LibWeb/Bindings/SVGPathElementWrapper.h>
|
||||
#include <LibWeb/Bindings/SVGPolygonElementWrapper.h>
|
||||
#include <LibWeb/Bindings/SVGPolylineElementWrapper.h>
|
||||
#include <LibWeb/Bindings/SVGRectElementWrapper.h>
|
||||
#include <LibWeb/Bindings/SVGSVGElementWrapper.h>
|
||||
|
@ -165,6 +166,7 @@
|
|||
#include <LibWeb/SVG/SVGEllipseElement.h>
|
||||
#include <LibWeb/SVG/SVGLineElement.h>
|
||||
#include <LibWeb/SVG/SVGPathElement.h>
|
||||
#include <LibWeb/SVG/SVGPolygonElement.h>
|
||||
#include <LibWeb/SVG/SVGPolylineElement.h>
|
||||
#include <LibWeb/SVG/SVGRectElement.h>
|
||||
#include <LibWeb/SVG/SVGSVGElement.h>
|
||||
|
@ -325,6 +327,8 @@ NodeWrapper* wrap(JS::GlobalObject& global_object, DOM::Node& node)
|
|||
return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGEllipseElement>(node)));
|
||||
if (is<SVG::SVGLineElement>(node))
|
||||
return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGLineElement>(node)));
|
||||
if (is<SVG::SVGPolygonElement>(node))
|
||||
return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGPolygonElement>(node)));
|
||||
if (is<SVG::SVGPolylineElement>(node))
|
||||
return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGPolylineElement>(node)));
|
||||
if (is<SVG::SVGPathElement>(node))
|
||||
|
|
|
@ -261,6 +261,8 @@
|
|||
#include <LibWeb/Bindings/SVGLineElementPrototype.h>
|
||||
#include <LibWeb/Bindings/SVGPathElementConstructor.h>
|
||||
#include <LibWeb/Bindings/SVGPathElementPrototype.h>
|
||||
#include <LibWeb/Bindings/SVGPolygonElementConstructor.h>
|
||||
#include <LibWeb/Bindings/SVGPolygonElementPrototype.h>
|
||||
#include <LibWeb/Bindings/SVGPolylineElementConstructor.h>
|
||||
#include <LibWeb/Bindings/SVGPolylineElementPrototype.h>
|
||||
#include <LibWeb/Bindings/SVGRectElementConstructor.h>
|
||||
|
@ -448,6 +450,7 @@
|
|||
ADD_WINDOW_OBJECT_INTERFACE(SVGGraphicsElement) \
|
||||
ADD_WINDOW_OBJECT_INTERFACE(SVGLineElement) \
|
||||
ADD_WINDOW_OBJECT_INTERFACE(SVGPathElement) \
|
||||
ADD_WINDOW_OBJECT_INTERFACE(SVGPolygonElement) \
|
||||
ADD_WINDOW_OBJECT_INTERFACE(SVGPolylineElement) \
|
||||
ADD_WINDOW_OBJECT_INTERFACE(SVGRectElement) \
|
||||
ADD_WINDOW_OBJECT_INTERFACE(SVGSVGElement) \
|
||||
|
|
|
@ -274,6 +274,7 @@ set(SOURCES
|
|||
SVG/SVGCircleElement.cpp
|
||||
SVG/SVGEllipseElement.cpp
|
||||
SVG/SVGLineElement.cpp
|
||||
SVG/SVGPolygonElement.cpp
|
||||
SVG/SVGPolylineElement.cpp
|
||||
SVG/SVGRectElement.cpp
|
||||
SVG/SVGSVGElement.cpp
|
||||
|
@ -521,6 +522,7 @@ libweb_js_wrapper(SVG/SVGCircleElement)
|
|||
libweb_js_wrapper(SVG/SVGEllipseElement)
|
||||
libweb_js_wrapper(SVG/SVGLineElement)
|
||||
libweb_js_wrapper(SVG/SVGPathElement)
|
||||
libweb_js_wrapper(SVG/SVGPolygonElement)
|
||||
libweb_js_wrapper(SVG/SVGPolylineElement)
|
||||
libweb_js_wrapper(SVG/SVGRectElement)
|
||||
libweb_js_wrapper(SVG/SVGSVGElement)
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
#include <LibWeb/SVG/SVGGElement.h>
|
||||
#include <LibWeb/SVG/SVGLineElement.h>
|
||||
#include <LibWeb/SVG/SVGPathElement.h>
|
||||
#include <LibWeb/SVG/SVGPolygonElement.h>
|
||||
#include <LibWeb/SVG/SVGPolylineElement.h>
|
||||
#include <LibWeb/SVG/SVGRectElement.h>
|
||||
#include <LibWeb/SVG/SVGSVGElement.h>
|
||||
|
@ -247,6 +248,8 @@ NonnullRefPtr<Element> create_element(Document& document, const FlyString& tag_n
|
|||
return adopt_ref(*new SVG::SVGLineElement(document, move(qualified_name)));
|
||||
if (lowercase_tag_name == SVG::TagNames::path)
|
||||
return adopt_ref(*new SVG::SVGPathElement(document, move(qualified_name)));
|
||||
if (lowercase_tag_name == SVG::TagNames::polygon)
|
||||
return adopt_ref(*new SVG::SVGPolygonElement(document, move(qualified_name)));
|
||||
if (lowercase_tag_name == SVG::TagNames::polyline)
|
||||
return adopt_ref(*new SVG::SVGPolylineElement(document, move(qualified_name)));
|
||||
if (lowercase_tag_name == SVG::TagNames::rect)
|
||||
|
|
|
@ -251,6 +251,7 @@ class SVGGeometryElement;
|
|||
class SVGGraphicsElement;
|
||||
class SVGLineElement;
|
||||
class SVGPathElement;
|
||||
class SVGPolygonElement;
|
||||
class SVGPolylineElement;
|
||||
class SVGRectElement;
|
||||
class SVGSVGElement;
|
||||
|
@ -461,6 +462,7 @@ class SVGGeometryElementWrapper;
|
|||
class SVGGraphicsElementWrapper;
|
||||
class SVGLineElementWrapper;
|
||||
class SVGPathElementWrapper;
|
||||
class SVGPolygonElementWrapper;
|
||||
class SVGPolylineElementWrapper;
|
||||
class SVGRectElementWrapper;
|
||||
class SVGSVGElementWrapper;
|
||||
|
|
54
Userland/Libraries/LibWeb/SVG/SVGPolygonElement.cpp
Normal file
54
Userland/Libraries/LibWeb/SVG/SVGPolygonElement.cpp
Normal file
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "SVGPolygonElement.h"
|
||||
#include <LibWeb/SVG/AttributeNames.h>
|
||||
#include <LibWeb/SVG/AttributeParser.h>
|
||||
|
||||
namespace Web::SVG {
|
||||
|
||||
SVGPolygonElement::SVGPolygonElement(DOM::Document& document, QualifiedName qualified_name)
|
||||
: SVGGeometryElement(document, qualified_name)
|
||||
{
|
||||
}
|
||||
|
||||
void SVGPolygonElement::parse_attribute(FlyString const& name, String const& value)
|
||||
{
|
||||
SVGGeometryElement::parse_attribute(name, value);
|
||||
|
||||
if (name == SVG::AttributeNames::points) {
|
||||
m_points = AttributeParser::parse_points(value);
|
||||
m_path.clear();
|
||||
}
|
||||
}
|
||||
|
||||
Gfx::Path& SVGPolygonElement::get_path()
|
||||
{
|
||||
if (m_path.has_value())
|
||||
return m_path.value();
|
||||
|
||||
Gfx::Path path;
|
||||
|
||||
if (m_points.is_empty()) {
|
||||
m_path = move(path);
|
||||
return m_path.value();
|
||||
}
|
||||
|
||||
// 1. perform an absolute moveto operation to the first coordinate pair in the list of points
|
||||
path.move_to(m_points.first());
|
||||
|
||||
// 2. for each subsequent coordinate pair, perform an absolute lineto operation to that coordinate pair.
|
||||
for (size_t point_index = 1; point_index < m_points.size(); ++point_index)
|
||||
path.line_to(m_points[point_index]);
|
||||
|
||||
// 3. perform a closepath command
|
||||
path.close();
|
||||
|
||||
m_path = move(path);
|
||||
return m_path.value();
|
||||
}
|
||||
|
||||
}
|
30
Userland/Libraries/LibWeb/SVG/SVGPolygonElement.h
Normal file
30
Userland/Libraries/LibWeb/SVG/SVGPolygonElement.h
Normal file
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LibWeb/SVG/SVGGeometryElement.h>
|
||||
|
||||
namespace Web::SVG {
|
||||
|
||||
class SVGPolygonElement final : public SVGGeometryElement {
|
||||
public:
|
||||
using WrapperType = Bindings::SVGPolygonElementWrapper;
|
||||
|
||||
SVGPolygonElement(DOM::Document&, QualifiedName);
|
||||
virtual ~SVGPolygonElement() override = default;
|
||||
|
||||
virtual void parse_attribute(FlyString const& name, String const& value) override;
|
||||
|
||||
virtual Gfx::Path& get_path() override;
|
||||
|
||||
private:
|
||||
Optional<Gfx::Path> m_path;
|
||||
|
||||
Vector<Gfx::FloatPoint> m_points;
|
||||
};
|
||||
|
||||
}
|
5
Userland/Libraries/LibWeb/SVG/SVGPolygonElement.idl
Normal file
5
Userland/Libraries/LibWeb/SVG/SVGPolygonElement.idl
Normal file
|
@ -0,0 +1,5 @@
|
|||
[Exposed=Window]
|
||||
interface SVGPolygonElement : SVGGeometryElement {
|
||||
};
|
||||
|
||||
// SVGPolygonElement includes SVGAnimatedPoints;
|
|
@ -16,6 +16,7 @@ namespace Web::SVG::TagNames {
|
|||
__ENUMERATE_SVG_TAG(g) \
|
||||
__ENUMERATE_SVG_TAG(line) \
|
||||
__ENUMERATE_SVG_TAG(path) \
|
||||
__ENUMERATE_SVG_TAG(polygon) \
|
||||
__ENUMERATE_SVG_TAG(polyline) \
|
||||
__ENUMERATE_SVG_TAG(rect) \
|
||||
__ENUMERATE_SVG_TAG(svg)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue