add back definition of 2ndary clock delta text color

[ardour.git] / gtk2_ardour / canvas-note.cc

diff --git a/gtk2_ardour/canvas-note.cc b/gtk2_ardour/canvas-note.cc
index b43514edcc82d5383bba0a5303e614b00714a2bc..b98cbab5ff02172ed8e8905b88131e1e42cf0ccd 100644 (file)
--- a/gtk2_ardour/canvas-note.cc
+++ b/gtk2_ardour/canvas-note.cc
@@ -8,15 +8,49 @@ using namespace ARDOUR;
 namespace Gnome {
 namespace Canvas {
 
+CanvasNote::CanvasNote (MidiRegionView&                   region,
+                        Group&                            group,
+                        const boost::shared_ptr<NoteType> note,
+                        bool with_events)
+       : SimpleRect(group), CanvasNoteEvent(region, this, note)
+{
+       if (with_events) {
+               signal_event().connect (sigc::mem_fun (*this, &CanvasNote::on_event));
+       }
+}
+
 bool
 CanvasNote::on_event(GdkEvent* ev)
 {
-       if (!_region.get_trackview().editor().canvas_note_event (ev, this)) {
-               return CanvasNoteEvent::on_event (ev);
-       } else {
-               return true;
+       bool r = true;
+
+       if (!CanvasNoteEvent::on_event (ev)) {
+               r = _region.get_time_axis_view().editor().canvas_note_event (ev, this);
+       }
+
+       if (ev->type == GDK_BUTTON_RELEASE) {
+               _region.note_button_release ();
        }
+       
+       return r;
 }
 
+void
+CanvasNote::move_event(double dx, double dy)
+{
+       property_x1() = property_x1() + dx;
+       property_y1() = property_y1() + dy;
+       property_x2() = property_x2() + dx;
+       property_y2() = property_y2() + dy;
+
+       if (_text) {
+               _text->hide();
+               _text->property_x() = _text->property_x() + dx;
+               _text->property_y() = _text->property_y() + dy;
+               _text->show();
+       }
+}
+
+
 } // namespace Gnome
 } // namespace Canvas