DummyBackend: fix midi event mux+sorting

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

diff --git a/libs/canvas/arc.cc b/libs/canvas/arc.cc
index c8eaf030e77e50ff8a68cd898ea2c075106537b6..e95fbe0ad599f82b402e5ed1f5cadd15454a12e0 100644 (file)
--- a/libs/canvas/arc.cc
+++ b/libs/canvas/arc.cc
@@ -16,8 +16,11 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <cmath>
 #include <algorithm>
+
 #include <cairomm/context.h>
+
 #include "pbd/compose.h"
 #include "canvas/circle.h"
 #include "canvas/types.h"
@@ -65,7 +68,10 @@ Arc::render (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) const
        if (_radius <= 0.0 || _arc_degrees <= 0.0) {
                return;
        }
-       context->arc (_center.x, _center.y, _radius, _start_degrees * (M_PI/180.0), _arc_degrees * (M_PI/180.0));
+       
+       Duple c = item_to_window (Duple (_center.x, _center.y));
+
+       context->arc (c.x, c.y, _radius, _start_degrees * (M_PI/180.0), _arc_degrees * (M_PI/180.0));
        setup_fill_context (context);
        context->fill_preserve ();
        setup_outline_context (context);
@@ -94,7 +100,6 @@ Arc::set_radius (Coord r)
        end_change ();
 }      
 
-
 void
 Arc::set_arc (double deg)
 {
@@ -118,3 +123,15 @@ Arc::set_start (double deg)
        end_change ();
 }      
 
+bool
+Arc::covers (Duple const & point) const
+{
+       Duple p = canvas_to_item (point);
+
+       double angle_degs = atan (p.y/p.x) * 2.0 * M_PI;
+       double radius = sqrt (p.x * p.x + p.y * p.y);
+       
+       return (angle_degs >= _start_degrees) && 
+               (angle_degs <= (_start_degrees + _arc_degrees)) && 
+               (radius < _radius);
+}