one less annoying compiler warning.

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

diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc
index 57c26874c454de36fb256c46f3b3f75cd7bc751b..1b75584849ef4500300f7afb06741e6b10518fa6 100644 (file)
--- a/libs/canvas/rectangle.cc
+++ b/libs/canvas/rectangle.cc
@@ -30,28 +30,41 @@
 using namespace std;
 using namespace ArdourCanvas;
 
-Rectangle::Rectangle (Group* parent)
+Rectangle::Rectangle (Canvas* c)
+       : Item (c)
+       , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM))
+{
+}
+
+Rectangle::Rectangle (Canvas* c, Rect const & rect)
+       : Item (c)
+       , _rect (rect)
+       , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM))
+{
+}
+
+Rectangle::Rectangle (Item* parent)
        : Item (parent)
-       , Outline (parent)
-       , Fill (parent)
        , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM))
 {
 }
 
-Rectangle::Rectangle (Group* parent, Rect const & rect)
+Rectangle::Rectangle (Item* parent, Rect const & rect)
        : Item (parent)
-       , Outline (parent)
-       , Fill (parent)
        , _rect (rect)
        , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM))
 {
-       
 }
 
 void
 Rectangle::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
-       Rect self = item_to_window (_rect);
+       /* In general, a Rectangle will have a _position of (0,0) within its
+          parent, and its extent is actually defined by _rect. But in the
+          unusual case that _position is set to something other than (0,0),
+          we should take that into account when rendering.
+       */
+       Rect self = item_to_window (_rect.translate (_position));
        boost::optional<Rect> r = self.intersection (area);
 
        if (!r) {
@@ -105,8 +118,8 @@ Rectangle::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) con
                        
                        if (_outline_what & RIGHT) {
                                /* vertical line: move x-coordinate by 0.5 pixels */
-                               context->move_to (self.x1 + 0.5, self.y0);
-                               context->line_to (self.x1 + 0.5, self.y1);
+                               context->move_to (self.x1 - 0.5, self.y0);
+                               context->line_to (self.x1 - 0.5, self.y1);
                        }
                        
                }