X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Ffill.cc;h=32af6bd74b740ac7985fc133de94e3fe17888177;hb=1ec471c961c328ca4c585d35f9e567135f301d2d;hp=6a424d8c6364bce32b3ee97a7f00a3abfb2ec8dd;hpb=30968b854257cb5f9159ca59589f783c85615601;p=ardour.git

diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc
index 6a424d8c63..32af6bd74b 100644
--- a/libs/canvas/fill.cc
+++ b/libs/canvas/fill.cc
@@ -1,61 +1,118 @@
-#include "ardour/utils.h"
+/*
+    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 <cairomm/cairomm.h>
 
-#include "pbd/xml++.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)
 {
-	begin_change ();
-	
-	_fill_color = color;
+	if (_fill_color != color) {
+		_self.begin_visual_change ();
+		_fill_color = color;
+
+		double r, g, b, a;
+		Gtkmm2ext::color_to_rgba (color, r, g, b, a);
+		if (a == 0.0) {
+			_transparent = true;
+		} else {
+			_transparent = false;
+		}
 
-	end_change ();
+		_self.end_visual_change ();
+	}
 }
 
 void
 Fill::set_fill (bool fill)
 {
-	begin_change ();
-	
-	_fill = fill;
-
-	end_change ();
+	if (_fill != fill) {
+		_self.begin_visual_change ();
+		_fill = fill;
+		_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::add_fill_state (XMLNode* node) const
+Fill::setup_gradient_context (Cairo::RefPtr<Cairo::Context> context, Rect const & self, Duple const & draw_origin) const
 {
-	node->add_property ("fill-color", string_compose ("%1", _fill_color));
-	node->add_property ("fill", _fill ? "yes" : "no");
+	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;
+		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_fill_state (XMLNode const * node)
+Fill::set_pattern (Cairo::RefPtr<Cairo::Pattern> p)
 {
-	_fill_color = atoll (node->property("fill-color")->value().c_str());
-	_fill = PBD::string_is_affirmative (node->property("fill")->value ().c_str());
+        _pattern = p;
+}
+
+void
+Fill::set_gradient (StopList const & stops, bool vertical)
+{
+	_self.begin_visual_change ();
+
+	if (stops.empty()) {
+		_stops.clear ();
+	} else {
+		_stops = stops;
+		_vertical_gradient = vertical;
+	}
 
-	_bounding_box_dirty = true;
+	_self.end_visual_change ();
 }