summaryrefslogtreecommitdiff
path: root/basegfx
diff options
context:
space:
mode:
authorRegina Henschel <regina@apache.org>2012-09-07 12:33:04 +0000
committerRegina Henschel <regina@apache.org>2012-09-07 12:33:04 +0000
commit2e1700bf4f7cf913c23d35f325a50d3aa25426cc (patch)
tree45bec13b981abf3c71ee1a52c2e7198db2f18aaf /basegfx
parentec7ef30693f10315ce80a8f5d7325a0e40855e66 (diff)
#i120642# expand target to maximum edge not to diagonal
Notes
Notes: merged as: d3dde5d940d69d6b859fef3ff722e349d7d89c54
Diffstat (limited to 'basegfx')
-rw-r--r--basegfx/source/tools/gradienttools.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx
index 531481226ac1..878fdac80de9 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -200,11 +200,11 @@ namespace basegfx
// add object expansion
if(bSquare)
{
- const double fOriginalDiag(sqrt((fTargetSizeX * fTargetSizeX) + (fTargetSizeY * fTargetSizeY)));
- fTargetOffsetX -= (fOriginalDiag - fTargetSizeX) / 2.0;
- fTargetOffsetY -= (fOriginalDiag - fTargetSizeY) / 2.0;
- fTargetSizeX = fOriginalDiag;
- fTargetSizeY = fOriginalDiag;
+ const double fSquareWidth((fTargetSizeX>fTargetSizeY) ? fTargetSizeX : fTargetSizeY);
+ fTargetOffsetX = fTargetOffsetX + fTargetSizeX / 2.0 - fSquareWidth / 2.0;
+ fTargetOffsetY = fTargetOffsetY + fTargetSizeY / 2.0 - fSquareWidth / 2.0;
+ fTargetSizeX = fSquareWidth;
+ fTargetSizeY = fSquareWidth;
}
// add object expansion