X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Ffill.cc;h=42fe1556846857959c05c67efcf18c006bfeb182;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=8a16f4f794099d6250f054ced93b98928efee98d;hpb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;p=ardour.git

diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc
index 8a16f4f794..42fe155684 100644
--- a/libs/canvas/fill.cc
+++ b/libs/canvas/fill.cc
@@ -17,32 +17,46 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <cairomm/cairomm.h>
+
 #include "ardour/utils.h"
 
 #include "pbd/compose.h"
 #include "pbd/convert.h"
 
 #include "canvas/fill.h"
+#include "canvas/item.h"
+#include "canvas/types.h"
 #include "canvas/utils.h"
+#include "canvas/colors.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)
 {
 	if (_fill_color != color) {
-		begin_visual_change ();
+		_self.begin_visual_change ();
 		_fill_color = color;
-		end_visual_change ();
+
+		double r, g, b, a;
+		color_to_rgba (color, r, g, b, a);
+		if (a == 0.0) {
+			_transparent = true;
+		} else {
+			_transparent = false;
+		}
+
+		_self.end_visual_change ();
 	}
 }
 
@@ -50,42 +64,52 @@ 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
 {
-	set_source_rgba (context, _fill_color);
+        if (_pattern) {
+                context->set_source (_pattern);
+        } else {
+                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_pattern (Cairo::RefPtr<Cairo::Pattern> p)
+{
+        _pattern = p;
+}
+
 void
 Fill::set_gradient (StopList const & stops, bool vertical)
 {
-	begin_visual_change ();
+	_self.begin_visual_change ();
 
 	if (stops.empty()) {
 		_stops.clear ();
@@ -94,5 +118,5 @@ Fill::set_gradient (StopList const & stops, bool vertical)
 		_vertical_gradient = vertical;
 	}
 
-	end_visual_change ();
+	_self.end_visual_change ();
 }