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

diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc
index 8a16f4f794..ab5056fa3d 100644
--- a/libs/canvas/fill.cc
+++ b/libs/canvas/fill.cc
@@ -1,48 +1,59 @@
 /*
-    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 "ardour/utils.h"
+ * Copyright (C) 2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2013-2014 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2015-2017 Robin Gareus <robin@gareus.org>
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#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,42 +61,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 {
+					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 {
 		_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);
+		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, bool vertical)
 {
-	begin_visual_change ();
+	_self.begin_visual_change ();
 
 	if (stops.empty()) {
 		_stops.clear ();
@@ -94,5 +115,5 @@ Fill::set_gradient (StopList const & stops, bool vertical)
 		_vertical_gradient = vertical;
 	}
 
-	end_visual_change ();
+	_self.end_visual_change ();
 }