Fix oops in previous commit.

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

diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc
index c6381776e4ff4f554df5c8c694e5c1241d48763c..0014958e909344aee4735666abf2152e642cffbe 100644 (file)
--- a/libs/canvas/rectangle.cc
+++ b/libs/canvas/rectangle.cc
@@ -98,45 +98,37 @@ Rectangle::render_self (Rect const & area, Cairo::RefPtr<Cairo::Context> context
                 * thick, it will precisely align with the corner
                 * coordinates of the rectangle. So if the rectangle
                 * has a left edge at 0 and a right edge at 10, then
-                * the left edge must span -0.5..+0.5, the right edge
-                * must span 9.5..10.5 (i.e. the single full color
-                * pixel is precisely aligned with 0 and 10
-                * respectively).
-                *
-                * we have to shift left/up in all cases, which means
-                * subtraction along both axes (i.e. edge at
-                * N, outline must start at N-0.5). 
-                *
-                * see the cairo FAQ on single pixel lines to see why we do
-                * the 0.5 pixel additions.
+                * the left edge must span 0..1, the right edge
+                * must span 9..10 because the first and final pixels
+                * to be colored are actually "at" 0.5 and 9.5 (midway
+                * between the integer coordinates.
                 */
 
-               self = self.translate (Duple (0.5, 0.5));
-
                if (_outline_what == What (LEFT|RIGHT|BOTTOM|TOP)) {
                        
+                       self = self.shrink (0.5);
                        context->rectangle (self.x0, self.y0, self.width(), self.height());
 
                } else {
 
                        if (_outline_what & LEFT) {
-                               context->move_to (self.x0, self.y0);
-                               context->line_to (self.x0, self.y1);
+                               context->move_to (self.x0+0.5, self.y0);
+                               context->line_to (self.x0+0.5, self.y1);
                        }
                        
                        if (_outline_what & TOP) {
-                               context->move_to (self.x0, self.y0);
-                               context->line_to (self.x1, self.y0);
+                               context->move_to (self.x0, self.y0+0.5);
+                               context->line_to (self.x1, self.y0+0.5);
                        }
 
                        if (_outline_what & BOTTOM) {
-                               context->move_to (self.x0, self.y1);
-                               context->line_to (self.x1, self.y1);
+                               context->move_to (self.x0, self.y1-0.5);
+                               context->line_to (self.x1, self.y1-0.5);
                        }
                        
                        if (_outline_what & RIGHT) {
-                               context->move_to (self.x1, self.y0);
-                               context->line_to (self.x1, self.y1);
+                               context->move_to (self.x1-0.5, self.y0);
+                               context->line_to (self.x1-0.5, self.y1);
                        }
                }
                
@@ -155,13 +147,6 @@ Rectangle::compute_bounding_box () const
 {
        if (!_rect.empty()) {
                Rect r = _rect.fix ();
-
-               /* take into acount the 0.5 addition to the bounding
-                  box for the right and bottom edges, see ::render() above
-               */
-
-               r = r.expand (1.0);
-
                _bounding_box = r;
        }
 
@@ -255,25 +240,25 @@ void
 TimeRectangle::compute_bounding_box () const
 {
        Rectangle::compute_bounding_box ();
-       assert (_bounding_box);
-
-       Rect r = _bounding_box.get ();
 
-       /* This is a TimeRectangle, so its right edge is drawn 1 pixel beyond
-        * (larger x-axis coordinates) than a normal Rectangle.
-        */
-       
-       r.x1 += 1.0; /* this should be using safe_add() */
-       
-       _bounding_box = r;
+       if (_bounding_box) {
+               Rect r = _bounding_box.get ();
+               
+               /* This is a TimeRectangle, so its right edge is drawn 1 pixel beyond
+                * (larger x-axis coordinates) than a normal Rectangle.
+                */
+               
+               r.x1 += 1.0; /* this should be using safe_add() */
+               
+               _bounding_box = r;
+       }
 }
 
 void 
 TimeRectangle::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
        Rect self = get_self_for_render ();
-
-
+       
        /* This is a TimeRectangle, so its right edge is drawn 1 pixel beyond
         * (larger x-axis coordinates) than a normal Rectangle.
         */