X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Ffill.cc;h=32af6bd74b740ac7985fc133de94e3fe17888177;hb=e44ae422ebb5c1b18cc03cb2254e3cf3308565e0;hp=9947415cf9462f433750dac108cbe9b84bb8c91e;hpb=11619a37bff79c050e39e434bc9899b516cbe4a1;p=ardour.git

diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc
index 9947415cf9..32af6bd74b 100644
--- a/libs/canvas/fill.cc
+++ b/libs/canvas/fill.cc
@@ -17,32 +17,42 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "ardour/utils.h"
+#include <cairomm/cairomm.h>
 
 #include "pbd/compose.h"
 #include "pbd/convert.h"
 
 #include "canvas/fill.h"
-#include "canvas/utils.h"
+#include "canvas/item.h"
+#include "canvas/types.h"
 
 using namespace std;
 using namespace ArdourCanvas;
 
-Fill::Fill (Group* parent)
-	: Item (parent)
+Fill::Fill (Item& self)
+	: _self (self)
 	, _fill_color (0x000000ff)
 	, _fill (true)
+	, _transparent (false)
 {
-
 }
 
 void
-Fill::set_fill_color (Color color)
+Fill::set_fill_color (Gtkmm2ext::Color color)
 {
 	if (_fill_color != color) {
-		begin_visual_change ();
+		_self.begin_visual_change ();
 		_fill_color = color;
-		end_visual_change ();
+
+		double r, g, b, a;
+		Gtkmm2ext::color_to_rgba (color, r, g, b, a);
+		if (a == 0.0) {
+			_transparent = true;
+		} else {
+			_transparent = false;
+		}
+
+		_self.end_visual_change ();
 	}
 }
 
@@ -50,40 +60,59 @@ void
 Fill::set_fill (bool fill)
 {
 	if (_fill != fill) {
-		begin_visual_change ();
+		_self.begin_visual_change ();
 		_fill = fill;
-		end_visual_change ();
+		_self.end_visual_change ();
 	}
 }
 
 void
 Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const
 {
-	if (_gradient) {
-		context->set_source (_gradient);
+        if (_pattern) {
+                context->set_source (_pattern);
+        } else {
+					Gtkmm2ext::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;
+		Gtkmm2ext::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_pattern (Cairo::RefPtr<Cairo::Pattern> p)
+{
+        _pattern = p;
 }
 
 void
-Fill::set_gradient (StopList const & stops, double height)
+Fill::set_gradient (StopList const & stops, bool vertical)
 {
-	begin_visual_change ();
+	_self.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 ();
+	_self.end_visual_change ();
 }