fix merge conflicts with master

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

diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc
index da475a988197ff4c7c8cff3cd68882295c0d088c..8a16f4f794099d6250f054ced93b98928efee98d 100644 (file)
--- a/libs/canvas/fill.cc
+++ b/libs/canvas/fill.cc
@@ -39,21 +39,21 @@ Fill::Fill (Group* parent)
 void
 Fill::set_fill_color (Color color)
 {
-       begin_visual_change ();
-       
-       _fill_color = color;
-
-       end_visual_change ();
+       if (_fill_color != color) {
+               begin_visual_change ();
+               _fill_color = color;
+               end_visual_change ();
+       }
 }
 
 void
 Fill::set_fill (bool fill)
 {
-       begin_visual_change ();
-       
-       _fill = fill;
-
-       end_visual_change ();
+       if (_fill != fill) {
+               begin_visual_change ();
+               _fill = fill;
+               end_visual_change ();
+       }
 }
 
 void
@@ -61,3 +61,38 @@ Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const
 {
        set_source_rgba (context, _fill_color);
 }
+
+void
+Fill::setup_gradient_context (Cairo::RefPtr<Cairo::Context> context, Rect const & self, Duple const & draw_origin) const
+{
+       Cairo::RefPtr<Cairo::LinearGradient> _gradient;
+       
+       if (_vertical_gradient) {
+               _gradient = Cairo::LinearGradient::create (draw_origin.x, self.y0, draw_origin.x, self.y1);
+       } else {
+               _gradient = Cairo::LinearGradient::create (self.x0, draw_origin.y, self.x1, draw_origin.y);
+       }
+       
+       for (StopList::const_iterator s = _stops.begin(); s != _stops.end(); ++s) {
+               double r, g, b, a;
+               color_to_rgba (s->second, r, g, b, a);
+               _gradient->add_color_stop_rgba (s->first, r, g, b, a);
+       }
+       
+       context->set_source (_gradient);
+}
+
+void
+Fill::set_gradient (StopList const & stops, bool vertical)
+{
+       begin_visual_change ();
+
+       if (stops.empty()) {
+               _stops.clear ();
+       } else {
+               _stops = stops;
+               _vertical_gradient = vertical;
+       }
+
+       end_visual_change ();
+}