summaryrefslogtreecommitdiff
path: root/drawinglayer/inc/texture
diff options
context:
space:
mode:
authorArmin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de>2023-02-15 10:45:10 +0100
committerArmin Le Grand <Armin.Le.Grand@me.com>2023-02-15 14:46:11 +0000
commitea1d3d11ca113042a99effc168da834894005370 (patch)
tree60aafa53ee15614b39b329c3510bbca913305f67 /drawinglayer/inc/texture
parentd88fa033f02b70e28dbef6b42a4e73abc24c3a60 (diff)
MCGR: Add GradientSteps to GeoTexSvxGradient
Move GradientSteps data to GeoTexSvxGradient and adapt interfaces. Also move tooling to more isolated place in gradienttools in basegfx. Keep everything still compatible, the work will be now to adapt all six different derivations of GeoTexSvxGradient to make use of the evtl. given GradientSteps. Change-Id: Iaa212763c603d46de0a94b1b203b979bb7ce359d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147050 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'drawinglayer/inc/texture')
-rw-r--r--drawinglayer/inc/texture/texture.hxx38
1 files changed, 16 insertions, 22 deletions
diff --git a/drawinglayer/inc/texture/texture.hxx b/drawinglayer/inc/texture/texture.hxx
index 9cfb2d6d56f7..567a24417f51 100644
--- a/drawinglayer/inc/texture/texture.hxx
+++ b/drawinglayer/inc/texture/texture.hxx
@@ -56,15 +56,15 @@ namespace drawinglayer::texture
protected:
basegfx::ODFGradientInfo maGradientInfo;
basegfx::B2DRange maDefinitionRange;
- basegfx::BColor maStart;
- basegfx::BColor maEnd;
+ sal_uInt32 mnRequestedSteps;
+ basegfx::ColorSteps mnColorSteps;
double mfBorder;
public:
GeoTexSvxGradient(
const basegfx::B2DRange& rDefinitionRange,
- const basegfx::BColor& rStart,
- const basegfx::BColor& rEnd,
+ sal_uInt32 nRequestedSteps,
+ const basegfx::ColorSteps& rColorSteps,
double fBorder);
virtual ~GeoTexSvxGradient() override;
@@ -87,9 +87,8 @@ namespace drawinglayer::texture
GeoTexSvxGradientLinear(
const basegfx::B2DRange& rDefinitionRange,
const basegfx::B2DRange& rOutputRange,
- const basegfx::BColor& rStart,
- const basegfx::BColor& rEnd,
- sal_uInt32 nSteps,
+ sal_uInt32 nRequestedSteps,
+ const basegfx::ColorSteps& rColorSteps,
double fBorder,
double fAngle);
virtual ~GeoTexSvxGradientLinear() override;
@@ -109,9 +108,8 @@ namespace drawinglayer::texture
GeoTexSvxGradientAxial(
const basegfx::B2DRange& rDefinitionRange,
const basegfx::B2DRange& rOutputRange,
- const basegfx::BColor& rStart,
- const basegfx::BColor& rEnd,
- sal_uInt32 nSteps,
+ sal_uInt32 nRequestedSteps,
+ const basegfx::ColorSteps& rColorSteps,
double fBorder,
double fAngle);
virtual ~GeoTexSvxGradientAxial() override;
@@ -127,9 +125,8 @@ namespace drawinglayer::texture
public:
GeoTexSvxGradientRadial(
const basegfx::B2DRange& rDefinitionRange,
- const basegfx::BColor& rStart,
- const basegfx::BColor& rEnd,
- sal_uInt32 nSteps,
+ sal_uInt32 nRequestedSteps,
+ const basegfx::ColorSteps& rColorSteps,
double fBorder,
double fOffsetX,
double fOffsetY);
@@ -146,9 +143,8 @@ namespace drawinglayer::texture
public:
GeoTexSvxGradientElliptical(
const basegfx::B2DRange& rDefinitionRange,
- const basegfx::BColor& rStart,
- const basegfx::BColor& rEnd,
- sal_uInt32 nSteps,
+ sal_uInt32 nRequestedSteps,
+ const basegfx::ColorSteps& rColorSteps,
double fBorder,
double fOffsetX,
double fOffsetY,
@@ -166,9 +162,8 @@ namespace drawinglayer::texture
public:
GeoTexSvxGradientSquare(
const basegfx::B2DRange& rDefinitionRange,
- const basegfx::BColor& rStart,
- const basegfx::BColor& rEnd,
- sal_uInt32 nSteps,
+ sal_uInt32 nRequestedSteps,
+ const basegfx::ColorSteps& rColorSteps,
double fBorder,
double fOffsetX,
double fOffsetY,
@@ -186,9 +181,8 @@ namespace drawinglayer::texture
public:
GeoTexSvxGradientRect(
const basegfx::B2DRange& rDefinitionRange,
- const basegfx::BColor& rStart,
- const basegfx::BColor& rEnd,
- sal_uInt32 nSteps,
+ sal_uInt32 nRequestedSteps,
+ const basegfx::ColorSteps& rColorSteps,
double fBorder,
double fOffsetX,
double fOffsetY,