using namespace ArdourCanvas;
-Polygon::Polygon (Group* parent)
- : Item (parent)
- , PolyItem (parent)
- , Fill (parent)
+Polygon::Polygon (Canvas* c)
+ : PolyItem (c)
, multiple (0)
, constant (0)
, cached_size (0)
{
+}
+Polygon::Polygon (Item* parent)
+ : PolyItem (parent)
+ , multiple (0)
+ , constant (0)
+ , cached_size (0)
+{
}
Polygon::~Polygon ()
void
Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
{
- if (_outline) {
- setup_outline_context (context);
+ if (_outline || _fill) {
render_path (area, context);
if (!_points.empty ()) {
/* close path */
Duple p = item_to_window (Duple (_points.front().x, _points.front().y));
- context->move_to (p.x, p.y);
+ context->line_to (p.x, p.y);
}
- context->stroke_preserve ();
+ }
+
+ if (_outline) {
+ setup_outline_context (context);
+ if (_fill) {
+ context->stroke_preserve ();
+ } else {
+ context->stroke ();
+ }
}
if (_fill) {
bool
Polygon::covers (Duple const & point) const
{
- Duple p = canvas_to_item (point);
+ Duple p = window_to_item (point);
Points::size_type npoints = _points.size();