Initial changes to support Dimension offsets.

[architektonas] / src / drawingview.cpp

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 7c5107ea3dd037284cfd6e24369124f7707452f2..842c5b382fefd3a88f9e2936550a2fc3bd7ce95a 100644 (file)
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -541,10 +541,10 @@ void DrawingView::RenderObjects(Painter * painter, std::vector<void *> & v, int
 
                        unit = Vector(d->lp[0], d->lp[1]).Unit();
 
-                       Point p1 = d->lp[0] + (ortho * 10.0 * scaledThickness);
-                       Point p2 = d->lp[1] + (ortho * 10.0 * scaledThickness);
-                       Point p3 = d->lp[0] + (ortho * 16.0 * scaledThickness);
-                       Point p4 = d->lp[1] + (ortho * 16.0 * scaledThickness);
+                       Point p1 = d->lp[0] + (ortho * (10.0 + d->offset) * scaledThickness);
+                       Point p2 = d->lp[1] + (ortho * (10.0 + d->offset) * scaledThickness);
+                       Point p3 = d->lp[0] + (ortho * (16.0 + d->offset) * scaledThickness);
+                       Point p4 = d->lp[1] + (ortho * (16.0 + d->offset) * scaledThickness);
                        Point p5 = d->p[0] + (ortho * 4.0 * scaledThickness);
                        Point p6 = d->p[1] + (ortho * 4.0 * scaledThickness);
 
@@ -2514,8 +2514,8 @@ bool DrawingView::HitTest(Object * obj, Point point)
                Vector orthogonal = Vector::Normal(d->lp[0], d->lp[1]);
                // Get our line parallel to our points
                float scaledThickness = Global::scale * obj->thickness;
-               Point p1 = d->lp[0] + (orthogonal * 10.0 * scaledThickness);
-               Point p2 = d->lp[1] + (orthogonal * 10.0 * scaledThickness);
+               Point p1 = d->lp[0] + (orthogonal * (10.0 + d->offset) * scaledThickness);
+               Point p2 = d->lp[1] + (orthogonal * (10.0 + d->offset) * scaledThickness);
                Point p3(p1, point);
 
                Vector v1(d->p[0], point);