X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=842c5b382fefd3a88f9e2936550a2fc3bd7ce95a;hb=c20f82651fdc4dd26172bcb71a85e6eb29eacd43;hp=60f941e94c37a3e63d738d15369b7b69c8cd1bfe;hpb=790c1a6d97f73f7457c7fad7e82fa29e5b6accd5;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 60f941e..842c5b3 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -2,7 +2,7 @@ // drawingview.cpp // // Part of the Architektonas Project -// (C) 2011 Underground Software +// (C) 2011-2020 Underground Software // See the README and GPLv3 files for licensing and warranty information // // JLH = James Hammons @@ -541,10 +541,10 @@ void DrawingView::RenderObjects(Painter * painter, std::vector & 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);