fix merge conflicts with master

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

diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc
index 9947415cf9462f433750dac108cbe9b84bb8c91e..8a16f4f794099d6250f054ced93b98928efee98d 100644 (file)
--- a/libs/canvas/fill.cc
+++ b/libs/canvas/fill.cc
@@ -59,30 +59,39 @@ Fill::set_fill (bool fill)
 void
 Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const
 {
-       if (_gradient) {
-               context->set_source (_gradient);
+       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 {
-               set_source_rgba (context, _fill_color);
+               _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, double height)
+Fill::set_gradient (StopList const & stops, bool vertical)
 {
        begin_visual_change ();
 
        if (stops.empty()) {
-               _gradient.clear();
+               _stops.clear ();
        } else {
-
-               double r, g, b, a;
-               
-               _gradient = Cairo::LinearGradient::create (0, 0, 0, height);
-               
-               for (StopList::const_iterator s = stops.begin(); s != stops.end(); ++s) {
-                       color_to_rgba (s->second, r, g, b, a);
-                       _gradient->add_color_stop_rgba (s->first, r, g, b, a);
-               }
+               _stops = stops;
+               _vertical_gradient = vertical;
        }
 
        end_visual_change ();