one less annoying compiler warning.

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

diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc
index acda1708a3f425799d5b2a894894005e5f6edd40..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) {
@@ -60,7 +73,7 @@ Rectangle::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) con
 
        Rect draw = r.get ();
 
-       if (_fill) {
+       if (_fill && !_transparent) {
                if (_stops.empty()) {
                        setup_fill_context (context);
                } else {
@@ -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);
                        }
                        
                }
@@ -124,7 +137,7 @@ Rectangle::compute_bounding_box () const
                   box for the right and bottom edges, see ::render() above
                */
 
-               r.x1 += 0.5;
+               r.x1 += 1.0; // XXX this makes no sense but is necessary
                r.y1 += 0.5;
 
                _bounding_box = r;
@@ -139,82 +152,77 @@ Rectangle::set (Rect const & r)
        /* We don't update the bounding box here; it's just
           as cheap to do it when asked.
        */
-       
-       begin_change ();
-       
-       _rect = r;
-       
-       _bounding_box_dirty = true;
-       end_change ();
 
-       DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (set)\n");
+       if (r != _rect) {
+               
+               begin_change ();
+               
+               _rect = r;
+               
+               _bounding_box_dirty = true;
+               end_change ();
+       }
 }
 
 void
 Rectangle::set_x0 (Coord x0)
 {
-       begin_change ();
-
-       _rect.x0 = x0;
-
-       _bounding_box_dirty = true;
-       end_change ();
-
-       DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (x0)\n");
+       if (x0 != _rect.x0) {
+               begin_change ();
+               
+               _rect.x0 = x0;
+               
+               _bounding_box_dirty = true;
+               end_change ();
+       }
 }
 
 void
 Rectangle::set_y0 (Coord y0)
 {
-       begin_change ();
-       
-       _rect.y0 = y0;
-
-       _bounding_box_dirty = true;
-       end_change();
-
-       DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (y0)\n");
+       if (y0 != _rect.y0) {
+               begin_change ();
+               
+               _rect.y0 = y0;
+               
+               _bounding_box_dirty = true;
+               end_change();
+       }
 }
 
 void
 Rectangle::set_x1 (Coord x1)
 {
-       begin_change ();
-       
-       _rect.x1 = x1;
-
-       _bounding_box_dirty = true;
-       end_change ();
-
-       DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (x1)\n");
+       if (x1 != _rect.x1) {
+               begin_change ();
+               
+               _rect.x1 = x1;
+               
+               _bounding_box_dirty = true;
+               end_change ();
+       }
 }
 
 void
 Rectangle::set_y1 (Coord y1)
 {
-       begin_change ();
-
-       _rect.y1 = y1;
-
-       _bounding_box_dirty = true;
-       end_change ();
-
-       DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (y1)\n");
+       if (y1 != _rect.y1) {
+               begin_change ();
+               
+               _rect.y1 = y1;
+               
+               _bounding_box_dirty = true;
+               end_change ();
+       }
 }
 
 void
 Rectangle::set_outline_what (What what)
 {
-       begin_change ();
-       
-       _outline_what = what;
-
-       end_change ();
-}
-
-void
-Rectangle::set_outline_what (int what)
-{
-       set_outline_what ((What) what);
+       if (what != _outline_what) {
+               begin_visual_change ();
+               _outline_what = what;
+               end_visual_change ();
+       }
 }