X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fpoly_line.cc;h=60bca6bccf87011de9afbc28f6a12d679d49184f;hb=a0cb2f95f0706179f88dc0175769705ddeded389;hp=7118e47555d1e74d0f03752e5855ffe8fbd2d8c5;hpb=c4f0063a68d189a59450a5bba658fc3092bc936b;p=ardour.git diff --git a/libs/canvas/poly_line.cc b/libs/canvas/poly_line.cc index 7118e47555..60bca6bccf 100644 --- a/libs/canvas/poly_line.cc +++ b/libs/canvas/poly_line.cc @@ -25,11 +25,16 @@ using namespace ArdourCanvas; -PolyLine::PolyLine (Group* parent) - : Item (parent) - , PolyItem (parent) +PolyLine::PolyLine (Canvas* c) + : PolyItem (c) + , _threshold (1.0) { +} +PolyLine::PolyLine (Item* parent) + : PolyItem (parent) + , _threshold (1.0) +{ } void @@ -45,7 +50,7 @@ PolyLine::render (Rect const & area, Cairo::RefPtr context) cons bool PolyLine::covers (Duple const & point) const { - Duple p = canvas_to_item (point); + Duple p = window_to_item (point); const Points::size_type npoints = _points.size(); @@ -58,8 +63,7 @@ PolyLine::covers (Duple const & point) const /* repeat for each line segment */ - const Rect visible (_canvas->visible_area()); - static const double threshold = 2.0; + const Rect visible (window_to_item (_canvas->visible_area())); for (i = 1, j = 0; i < npoints; ++i, ++j) { @@ -82,10 +86,10 @@ PolyLine::covers (Duple const & point) const double d = distance_to_segment_squared (p, a, b, t, at); if (t < 0.0 || t > 1.0) { - return false; + continue; } - if (d < threshold) { + if (d < _threshold + _outline_width) { return true; } @@ -93,3 +97,9 @@ PolyLine::covers (Duple const & point) const return false; } + +void +PolyLine::set_covers_threshold (double t) +{ + _threshold = t; +}