HIG-ify the locations UI a bit. Should fix #3526.

[ardour.git] / gtk2_ardour / canvas-hit.h

diff --git a/gtk2_ardour/canvas-hit.h b/gtk2_ardour/canvas-hit.h
index ffa1764003efbc09424b93044057f2f4ab8dc051..e6be076aa8b89e0f469ded0610e2ab9eca10224f 100644 (file)
--- a/gtk2_ardour/canvas-hit.h
+++ b/gtk2_ardour/canvas-hit.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -29,25 +29,28 @@ namespace Canvas {
 
 class CanvasHit : public Diamond, public CanvasNoteEvent {
 public:
+       typedef Evoral::Note<double> NoteType;
+
        CanvasHit(
-                       MidiRegionView&                       region,
-                       Group&                                group,
-                       double                                size,
-                       const boost::shared_ptr<ARDOUR::Note> note = boost::shared_ptr<ARDOUR::Note>())
-
-               : Diamond(group, size), CanvasMidiEvent(region, this, note)
-       {
-       }
-       
+                       MidiRegionView&                   region,
+                       Group&                            group,
+                       double                            size,
+                       const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
+                        bool with_events = true);
+
+       void show() { Diamond::show(); }
+       void hide() { Diamond::hide(); }
+
        double x1() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x1; }
        double y1() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return y1; }
        double x2() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x2; }
        double y2() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return y2; }
-       
+
        void set_outline_color(uint32_t c) { property_outline_color_rgba() = c; }
        void set_fill_color(uint32_t c) { property_fill_color_rgba() = c; }
 
-       bool on_event(GdkEvent* ev) { return CanvasNoteEvent::on_event(ev); }
+       bool on_event(GdkEvent* ev);
+       void move_event(double dx, double dy);
 };
 
 } // namespace Gnome