ardour/livetrax
13
0
Fork 0
Code

fix confusion in Canvas::LineSet over window vs. item coordinates that affected redraw (or not) of MIDI track note lines when the canvas origin != 0

Browse Source
This commit is contained in:
Paul Davis 2013-10-22 21:12:47 -04:00
parent 664e715a00
commit 192f22d89e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/canvas/line_set.cc
View File

@ -67,16 +67,25 @@ LineSet::set_height (Distance height)
void void
LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
{ {
/* area is in window coordinates */
for (list<Line>::const_iterator i = _lines.begin(); i != _lines.end(); ++i) { for (list<Line>::const_iterator i = _lines.begin(); i != _lines.end(); ++i) {
if (i->y > area.y1) {
Duple self = item_to_window (Duple (area.x0, i->y));
if (self.y > area.y1) {
/* line is past the ymax for the render rect, nothing
to draw
*/
break; break;
} else if (i->y > area.y0) { } else if (self.y > area.y0) {
/* line is between ymin and ymax for the render rect,
draw something.
*/
set_source_rgba (context, i->color); set_source_rgba (context, i->color);
context->set_line_width (i->width); context->set_line_width (i->width);
Duple p0 = item_to_window (Duple (area.x0, i->y)); context->move_to (area.x0, self.y);
Duple p1 = item_to_window (Duple (area.x1, i->y)); context->line_to (area.x1, self.y);
context->move_to (p0.x, p0.y);
context->line_to (p1.x, p1.y);
context->stroke (); context->stroke ();
} }
} }