fix merge conflicts from master

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

diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc
index 249106de33fe748578d1f9555bbfc5df1927a361..d90fd3a94335b61233b70aeb5a6751c3b434f41d 100644 (file)
--- a/libs/canvas/rectangle.cc
+++ b/libs/canvas/rectangle.cc
@@ -1,8 +1,28 @@
+/*
+    Copyright (C) 2011-2013 Paul Davis
+    Author: Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #include <iostream>
 #include <cairomm/context.h>
 #include "pbd/stacktrace.h"
-#include "pbd/xml++.h"
 #include "pbd/compose.h"
+
+#include "canvas/canvas.h"
 #include "canvas/rectangle.h"
 #include "canvas/debug.h"
 #include "canvas/utils.h"
@@ -30,73 +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
 {
-       Rect plot = _rect;
+       Rect self = item_to_window (_rect);
+       boost::optional<Rect> r = self.intersection (area);
 
-       plot.x1 = min (plot.x1, CAIRO_MAX);
-       plot.y1 = min (plot.y1, CAIRO_MAX);
+       if (!r) {
+               std::cerr << whatami() << '/' << name << " not covered by render area! ... " << self << " vs. " << area << std::endl;
+               return;
+       }
+
+       Rect draw = r.get ();
 
        if (_fill) {
-               setup_fill_context (context);
-               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) {
-               
-               if (_outline_what == What (LEFT|RIGHT|BOTTOM|TOP)) {
 
-                       /* if we filled and use full outline, we are already done */
+               setup_outline_context (context);
 
-                       if (!_fill) { 
-                               context->rectangle (plot.x0, plot.y0, plot.width(), plot.height());
-                               setup_outline_context (context);
-                               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);
-                       }
-                       
-                       setup_outline_context (context);
-                       context->stroke ();
+               context->save ();
+               context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
+               context->clip ();
+
+               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 ();
        }
 }
 
@@ -104,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;
 }