X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnote.cc;h=6e1878afc0651c23b3d7bba5b34288693202185f;hb=ba82e673fd4435065ae9689411d7ed0d232b8cde;hp=c9a60a7de93e7247277448b897c308ccee6bd416;hpb=658bb3ccd43658de18fbd43cd91a8e66650e27a7;p=ardour.git

diff --git a/gtk2_ardour/note.cc b/gtk2_ardour/note.cc
index c9a60a7de9..6e1878afc0 100644
--- a/gtk2_ardour/note.cc
+++ b/gtk2_ardour/note.cc
@@ -19,26 +19,22 @@
 */
 
 #include "evoral/Note.hpp"
+
 #include "canvas/rectangle.h"
+#include "canvas/debug.h"
+
 #include "note.h"
-#include "midi_region_view.h"
 #include "public_editor.h"
 
 using namespace ARDOUR;
 using namespace ArdourCanvas;
 
 Note::Note (
-	MidiRegionView&                   region,
-	Group*                            group,
-	const boost::shared_ptr<NoteType> note,
-	bool with_events
-	)
+	MidiRegionView& region, Item* parent, const boost::shared_ptr<NoteType> note, bool with_events)
 	: NoteBase (region, with_events, note)
+	, _rectangle (new ArdourCanvas::Rectangle (parent))
 {
-	_rectangle = new ArdourCanvas::Rectangle (group);
-#ifdef CANVAS_DEBUG
-	_rectangle->name = "note";
-#endif
+	CANVAS_DEBUG_NAME (_rectangle, "note");
 	set_item (_rectangle);
 }
 
@@ -50,15 +46,7 @@ Note::~Note ()
 void
 Note::move_event (double dx, double dy)
 {
-	_rectangle->move (Duple (dx, dy));
-
-	/* XXX */
-	// if (_text) {
-	// 	_text->hide();
-	// 	_text->property_x() = _text->property_x() + dx;
-	// 	_text->property_y() = _text->property_y() + dy;
-	// 	_text->show();
-	// }
+	_rectangle->set (_rectangle->get().translate (Duple (dx, dy)));
 }
 
 Coord
@@ -109,6 +97,12 @@ Note::hide ()
 	_rectangle->hide ();
 }
 
+void
+Note::set (ArdourCanvas::Rect rect)
+{
+	_rectangle->set (rect);
+}
+
 void
 Note::set_x0 (Coord x0)
 {
@@ -134,11 +128,17 @@ Note::set_y1 (Coord y1)
 }
 
 void
-Note::set_outline_what (int what)
+Note::set_outline_what (ArdourCanvas::Rectangle::What what)
 {
 	_rectangle->set_outline_what (what);
 }
 
+void
+Note::set_outline_all ()
+{
+	_rectangle->set_outline_all ();
+}
+
 void
 Note::set_ignore_events (bool ignore)
 {