Merge branch 'master' into cairocanvas

[ardour.git] / libs / canvas / polygon.cc

diff --git a/libs/canvas/polygon.cc b/libs/canvas/polygon.cc
index b89a7ca8802bf587008fd7ed2c8b72ed989e1cf8..1103cedbeea045861cb16ef3e5fa03c09efffd65 100644 (file)
--- a/libs/canvas/polygon.cc
+++ b/libs/canvas/polygon.cc
@@ -1,4 +1,22 @@
-#include "pbd/xml++.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 "canvas/polygon.h"
 
 using namespace ArdourCanvas;
@@ -19,7 +37,9 @@ Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
                render_path (area, context);
                
                if (!_points.empty ()) {
-                       context->move_to (_points.front().x, _points.front().y);
+                       /* close path */
+                       Duple p = item_to_window (Duple (_points.front().x, _points.front().y));
+                       context->move_to (p.x, p.y);
                }
 
                context->stroke_preserve ();
@@ -31,26 +51,3 @@ Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
        }
 }
 
-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);
-}