fix merge conflicts from master

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

diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc
index bb1198c1bb1c1c7b9ce394497b867a80eff7cfa8..d90fd3a94335b61233b70aeb5a6751c3b434f41d 100644 (file)
--- a/libs/canvas/rectangle.cc
+++ b/libs/canvas/rectangle.cc
@@ -50,84 +50,58 @@ Rectangle::Rectangle (Group* parent, Rect const & rect)
 }
 
 void
-Rectangle::render (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) const
+Rectangle::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
-       /* Cairo goes a little (!) wrong when asked to fill/stroke rectangles that
-        * extend way beyond the surface boundaries. To avoid this issue,
-        * clamp what we are drawing using the absolute end of the visible
-        * canvas, converting to item-space coordinates, of course.
-        */
+       Rect self = item_to_window (_rect);
+       boost::optional<Rect> r = self.intersection (area);
 
-       Rect plot = _rect;
-       Rect visible = _canvas->visible_area();
-       Duple visible_end = canvas_to_item (Duple (visible.x1, visible.y1));
+       if (!r) {
+               std::cerr << whatami() << '/' << name << " not covered by render area! ... " << self << " vs. " << area << std::endl;
+               return;
+       }
 
-       plot.x1 = min (plot.x1, visible_end.x);
-       plot.y1 = min (plot.y1, visible_end.y); 
+       Rect draw = r.get ();
 
        if (_fill) {
-               setup_fill_context (context);
-               cerr << "Fill rect: " << plot << endl;
-               context->rectangle (plot.x0, plot.y0, plot.width(), plot.height());
-               
-               if (!_outline) {
-                       context->fill ();
+               if (_stops.empty()) {
+                       setup_fill_context (context);
                } else {
-                       
-                       /* special/common case: outline the entire rectangle is
-                        * requested, so just use the same path for the fill
-                        * and stroke.
-                        */
-
-                       if (_outline_what == What (LEFT|RIGHT|BOTTOM|TOP)) {
-                               context->fill_preserve();
-                               setup_outline_context (context);
-                               context->stroke ();
-                       } else {
-                               context->fill ();
-                       }
+                       setup_gradient_context (context, self, Duple (draw.x0, draw.y0));
                }
-       } 
+               context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
+               context->fill ();
+       }
        
        if (_outline) {
-               
-               setup_outline_context (context);
 
-               if (_outline_what == What (LEFT|RIGHT|BOTTOM|TOP)) {
+               setup_outline_context (context);
 
-                       /* if we filled and use full outline, we are already
-                        * done. otherwise, draw the frame here.
-                        */
+               context->save ();
+               context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
+               context->clip ();
 
-                       if (!_fill) { 
-                               context->rectangle (plot.x0, plot.y0, plot.width(), plot.height());
-                               context->stroke ();
-                       }
-                       
-               } else {
-                       
-                       if (_outline_what & LEFT) {
-                               context->move_to (plot.x0, plot.y0);
-                               context->line_to (plot.x0, plot.y1);
-                       }
-                       
-                       if (_outline_what & BOTTOM) {
-                               context->move_to (plot.x0, plot.y1);
-                               context->line_to (plot.x1, plot.y1);
-                       }
-                       
-                       if (_outline_what & RIGHT) {
-                               context->move_to (plot.x1, plot.y0);
-                               context->line_to (plot.x1, plot.y1);
-                       }
-                       
-                       if (_outline_what & TOP) {
-                               context->move_to (plot.x0, plot.y0);
-                               context->line_to (plot.x1, plot.y0);
-                       }
-                       
-                       context->stroke ();
+               if (_outline_what & LEFT) {
+                       context->move_to (self.x0, self.y0);
+                       context->line_to (self.x0, self.y1);
                }
+               
+               if (_outline_what & BOTTOM) {
+                       context->move_to (self.x0, self.y1);
+                       context->line_to (self.x1, self.y1);
+               }
+               
+               if (_outline_what & RIGHT) {
+                       context->move_to (self.x1, self.y0);
+                       context->line_to (self.x1, self.y1);
+               }
+               
+               if (_outline_what & TOP) {
+                       context->move_to (self.x0, self.y0);
+                       context->line_to (self.x1, self.y0);
+               }
+               
+               context->stroke ();
+               context->restore ();
        }
 }
 
@@ -135,8 +109,7 @@ void
 Rectangle::compute_bounding_box () const
 {
        Rect r = _rect.fix ();
-       _bounding_box = boost::optional<Rect> (r.expand (_outline_width / 2));
-       
+       _bounding_box = boost::optional<Rect> (r.expand (_outline_width/2.0));
        _bounding_box_dirty = false;
 }