Nicely draw borders using drawinglayer

1 files changed, 29 insertions, 20 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 2bc5ba4db08c..12cdbbe21009 100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -32,6 +32,7 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -60,13 +61,17 @@ namespace drawinglayer
             double                                          mfRightWidth;
 
             /// edge overlap sizes
-            double                                          mfExtendInnerStart;
-            double                                          mfExtendInnerEnd;
-            double                                          mfExtendOuterStart;
-            double                                          mfExtendOuterEnd;
+            double                                          mfExtendLeftStart;
+            double                                          mfExtendLeftEnd;
+            double                                          mfExtendRightStart;
+            double                                          mfExtendRightEnd;
+
+            /// the line colors
+            basegfx::BColor                                 maRGBColorRight;
+            basegfx::BColor                                 maRGBColorLeft;
+            basegfx::BColor                                 maRGBColorGap;
+            bool                                            mbHasGapColor;
 
-            /// the line color
-            basegfx::BColor                                 maRGBColor;
             short                                           mnStyle;
 
             /// bitfield
@@ -115,6 +120,8 @@ namespace drawinglayer
                 return !basegfx::fTools::equalZero(mfRightWidth);
             }
 
+            basegfx::B2DPolyPolygon getClipPolygon( ) const;
+
         protected:
             /// create local decomposition
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
@@ -127,13 +134,14 @@ namespace drawinglayer
                 double fLeftWidth,
                 double fDistance,
                 double fRightWidth,
-                double fExtendInnerStart,
-                double fExtendInnerEnd,
-                double fExtendOuterStart,
-                double fExtendOuterEnd,
-                bool bCreateInside,
-                bool bCreateOutside,
-                const basegfx::BColor& rRGBColor,
+                double fExtendLeftStart,
+                double fExtendLeftEnd,
+                double fExtendRightStart,
+                double fExtendRightEnd,
+                const basegfx::BColor& rRGBColorRight,
+                const basegfx::BColor& rRGBColorLeft,
+                const basegfx::BColor& rRGBColorGap,
+                bool bHasGapColor,
                 const short nStyle );
 
             /// data read access
@@ -142,13 +150,14 @@ namespace drawinglayer
             double getLeftWidth() const { return mfLeftWidth; }
             double getDistance() const { return mfDistance; }
             double getRightWidth() const { return mfRightWidth; }
-            double getExtendInnerStart() const { return mfExtendInnerStart; }
-            double getExtendInnerEnd() const { return mfExtendInnerEnd; }
-            double getExtendOuterStart() const { return mfExtendOuterStart; }
-            double getExtendOuterEnd() const { return mfExtendOuterEnd; }
-            bool getCreateInside() const { return mbCreateInside; }
-            bool getCreateOutside() const { return mbCreateOutside; }
-            const basegfx::BColor& getRGBColor () const { return maRGBColor; }
+            double getExtendLeftStart() const { return mfExtendLeftStart; }
+            double getExtendLeftEnd() const { return mfExtendLeftEnd; }
+            double getExtendRightStart() const { return mfExtendRightStart; }
+            double getExtendRightEnd() const { return mfExtendRightEnd; }
+            const basegfx::BColor& getRGBColorRight () const { return maRGBColorRight; }
+            const basegfx::BColor& getRGBColorLeft () const { return maRGBColorLeft; }
+            const basegfx::BColor& getRGBColorGap () const { return maRGBColorGap; }
+            bool hasGapColor( ) const { return mbHasGapColor; }
             short getStyle () const { return mnStyle; }
 
             /// compare operator