projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
if CANVAS_DEBUG is defined, then the env variable CANVAS_HARLEQUIN_DEBUGGING will...
[ardour.git]
/
libs
/
canvas
/
poly_line.cc
diff --git
a/libs/canvas/poly_line.cc
b/libs/canvas/poly_line.cc
index 7118e47555d1e74d0f03752e5855ffe8fbd2d8c5..60bca6bccf87011de9afbc28f6a12d679d49184f 100644
(file)
--- a/
libs/canvas/poly_line.cc
+++ b/
libs/canvas/poly_line.cc
@@
-25,11
+25,16
@@
using namespace ArdourCanvas;
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
}
void
@@
-45,7
+50,7
@@
PolyLine::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) cons
bool
PolyLine::covers (Duple const & point) const
{
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();
const Points::size_type npoints = _points.size();
@@
-58,8
+63,7
@@
PolyLine::covers (Duple const & point) const
/* repeat for each line segment */
/* 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) {
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) {
double d = distance_to_segment_squared (p, a, b, t, at);
if (t < 0.0 || t > 1.0) {
-
return fals
e;
+
continu
e;
}
}
- if (d <
threshold
) {
+ if (d <
_threshold + _outline_width
) {
return true;
}
return true;
}
@@
-93,3
+97,9
@@
PolyLine::covers (Duple const & point) const
return false;
}
return false;
}
+
+void
+PolyLine::set_covers_threshold (double t)
+{
+ _threshold = t;
+}