summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-07-23 15:40:53 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-05-02 14:16:14 +0100
commit8f43c78e9a607df8c72232f03be4f9a7c80538de (patch)
tree37ff71299880163017f5513c76177365f926ddfd /svx
parente1ffd555b5c70e4bdc693711917ebffbb2423579 (diff)
Resolves: #i120230# Adapt hatch processing for a more pleasant visualisation
Adapt hatch processing to keep a view-dependent minimal distance for a more pleasant visualisation (cherry picked from commit 6a036e7ac17a1d4394d60471bd8931d9b16b7bb4) Conflicts: drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx drawinglayer/source/attribute/fillhatchattribute.cxx Change-Id: I15cd784ef7d3e47a20308f16d370c24ef46d2f22
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx1
-rw-r--r--svx/source/sdr/overlay/overlaytools.cxx1
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx1
3 files changed, 3 insertions, 0 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index fe82ff2a6a11..cad3b14d9df3 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -128,6 +128,7 @@ namespace sdr
125.0, // 1.25 mm
45.0 * F_PI180, // 45 degree diagonal
Color(COL_BLACK).getBColor(), // black color
+ 3, // same default as VCL, a minimum of three discrete units (pixels) offset
false); // no filling
const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonHatchPrimitive2D(
diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx
index 501ad81ac54b..181604c49b4c 100644
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@@ -230,6 +230,7 @@ namespace drawinglayer
getDiscreteHatchDistance() * getDiscreteUnit(),
getHatchRotation() - getRotation(),
getHatchColor(),
+ 3, // same default as VCL, a minimum of three discrete units (pixels) offset
false);
const Primitive2DReference aPrimitive(
new PolyPolygonHatchPrimitive2D(
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 88fce3ce1f3b..10e3dd171a60 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -453,6 +453,7 @@ namespace drawinglayer
(double)rHatch.GetDistance(),
(double)rHatch.GetAngle() * F_PI1800,
aColorB.getBColor(),
+ 3, // same default as VCL, a minimum of three discrete units (pixels) offset
((const XFillBackgroundItem&)(rSet.Get(XATTR_FILLBACKGROUND))).GetValue());
break;