initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 56 insertions, 0 deletions

diff --git a/libs/canvas/polygon.cc b/libs/canvas/polygon.cc
new file mode 100644
index 0000000000..b89a7ca880
--- /dev/null
+++ b/libs/canvas/polygon.cc
@@ -0,0 +1,56 @@
+#include "pbd/xml++.h"
+#include "canvas/polygon.h"
+
+using namespace ArdourCanvas;
+
+Polygon::Polygon (Group* parent)
+	: Item (parent)
+	, PolyItem (parent)
+	, Fill (parent)
+{
+
+}
+
+void
+Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
+{
+	if (_outline) {
+		setup_outline_context (context);
+		render_path (area, context);
+		
+		if (!_points.empty ()) {
+			context->move_to (_points.front().x, _points.front().y);
+		}
+
+		context->stroke_preserve ();
+	}
+
+	if (_fill) {
+		setup_fill_context (context);
+		context->fill ();
+	}
+}
+
+XMLNode *
+Polygon::get_state () const
+{
+	XMLNode* node = new XMLNode ("Polygon");
+#ifdef CANVAS_DEBUG
+	if (!name.empty ()) {
+		node->add_property ("name", name);
+	}
+#endif	
+	add_poly_item_state (node);
+	add_outline_state (node);
+	add_fill_state (node);
+	return node;
+}
+
+
+void
+Polygon::set_state (XMLNode const * node)
+{
+	set_poly_item_state (node);
+	set_outline_state (node);
+	set_fill_state (node);
+}