diff options
| author | Armin Le Grand (Collabora) <Armin.Le.Grand@me.com> | 2020-02-06 18:53:12 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2020-02-07 18:49:18 +0100 |
| commit | 5f61c9fe99ac93087b898adddbb4d4733f1fcd07 (patch) | |
| tree | 50e5e98702db8a12eba1e4f5dc730e76db2cca1e /include | |
| parent | 1fb4887613f2487be6081dd62c4df30f6170e2c0 (diff) | |
tdf#130478 Enhance Dashed line drawing on all systems
For more info and explanation including state of process
information and discussion(s) see task please.
Adding corrections for gerrit build
Change-Id: Ie10fb8093a86459dee80db5ab4355b47e46c1f8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88130
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/basegfx/polygon/b2dlinegeometry.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index c6973c6f161c..6a98d6189394 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -123,6 +123,13 @@ namespace basegfx the usual fallback to bevel is used. Allowed range is cropped to [F_PI .. 0.01 * F_PI]. + Commit 51b5b93092d6231615de470c62494c24e54828a1 needs + revert, we need the triangulation for X11 fat line drawing + + @param pTriangles + If given, the method will additionally add the created geometry as + B2DTriangle's + @return The tools::PolyPolygon containing the geometry of the extended line by it's line width. Contains bezier segments and edge roundings as @@ -135,7 +142,8 @@ namespace basegfx css::drawing::LineCap eCap, double fMaxAllowedAngle = basegfx::deg2rad(12.5), double fMaxPartOfEdge = 0.4, - double fMiterMinimumAngle = basegfx::deg2rad(15.0)); + double fMiterMinimumAngle = basegfx::deg2rad(15.0), + basegfx::triangulator::B2DTriangleVector* pTriangles = nullptr); } // end of namespace utils } // end of namespace basegfx diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c991867495ea..687b9a1c207a 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -799,6 +799,7 @@ public: const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth = 0.0, double fTransparency = 0.0, + const std::vector< double >* = nullptr, // MM01 basegfx::B2DLineJoin eLineJoin = basegfx::B2DLineJoin::NONE, css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT, double fMiterMinimumAngle = basegfx::deg2rad(15.0), |