Merge branch 'windows+cc' into cairocanvas

[ardour.git] / libs / canvas / poly_item.cc

diff --git a/libs/canvas/poly_item.cc b/libs/canvas/poly_item.cc
index ebf744a0b2fccacc2a35160148d74cbed65d4f3e..3b2e2efad9a8dafc1760e4c75eaad4e267ae4437 100644 (file)
--- a/libs/canvas/poly_item.cc
+++ b/libs/canvas/poly_item.cc
@@ -64,16 +64,22 @@ PolyItem::compute_bounding_box () const
 }
 
 void
-PolyItem::render_path (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) const
+PolyItem::render_path (Rect const & /* area */, Cairo::RefPtr<Cairo::Context> context) const
 {
+       if (_points.size() < 2) {
+               return;
+       }
+
        Points::const_iterator i = _points.begin();
        Duple c (item_to_window (Duple (i->x, i->y)));
+       const double pixel_adjust = (_outline_width == 1.0 ? 0.5 : 0.0);
 
-       context->move_to (c.x, c.y);
+       context->move_to (c.x + pixel_adjust, c.y + pixel_adjust);
+       ++i;
 
        while (i != _points.end()) {
                c = item_to_window (Duple (i->x, i->y));
-               context->line_to (c.x, c.y);
+               context->line_to (c.x + pixel_adjust, c.y + pixel_adjust);
                ++i;
        }
 }
@@ -81,8 +87,6 @@ PolyItem::render_path (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> cont
 void
 PolyItem::render_curve (Rect const & area, Cairo::RefPtr<Cairo::Context> context, Points const & first_control_points, Points const & second_control_points) const
 {
-       bool done_first = false;
-
        if (_points.size() <= 2) {
                render_path (area, context);
                return;
@@ -90,26 +94,30 @@ PolyItem::render_curve (Rect const & area, Cairo::RefPtr<Cairo::Context> context
 
        Points::const_iterator cp1 = first_control_points.begin();
        Points::const_iterator cp2 = second_control_points.begin();
-
-       for (Points::const_iterator i = _points.begin(); i != _points.end(); ++i) {
-
-               if (!done_first) {
-
-                       Duple c = item_to_window (Duple (i->x, i->y));
-                       context->move_to (c.x, c.y);
-                       done_first = true;
-
-               } else {
-
-                       Duple c1 = item_to_window (Duple (cp1->x, cp1->y));
-                       Duple c2 = item_to_window (Duple (cp2->x, cp2->y));
-                       Duple c3 = item_to_window (Duple (i->x, i->y));
-
-                       context->curve_to (c1.x, c1.y, c2.x, c2.y, c3.x, c3.y);
-
-                       cp1++;
-                       cp2++;
-               }
+       Points::const_iterator p = _points.begin();
+       const double pixel_adjust = (_outline_width == 1.0 ? 0.5 : 0.0);
+
+       Duple c = item_to_window (Duple (p->x, p->y));
+       context->move_to (c.x + pixel_adjust, c.y + pixel_adjust);
+       ++p;
+
+       while (p != _points.end()) {
+
+               Duple c1 = item_to_window (Duple (cp1->x, cp1->y));
+               Duple c2 = item_to_window (Duple (cp2->x, cp2->y));
+
+               c = item_to_window (Duple (p->x, p->y));
+               
+               context->curve_to (c1.x + pixel_adjust, 
+                                  c1.y + pixel_adjust, 
+                                  c2.x + pixel_adjust, 
+                                  c2.y + pixel_adjust, 
+                                  c.x + pixel_adjust, 
+                                  c.y + pixel_adjust);
+               
+               ++cp1;
+               ++cp2;
+               ++p;
        }
 }