X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=40245778d5b950dfc270f540c7484c79ddf8de06;hb=01251e7e14bba0b4604618ccfad87361e32dac18;hp=4a123f1e7951a43f0e8d825cfe3670b7e6664dec;hpb=30968b854257cb5f9159ca59589f783c85615601;p=ardour.git

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 4a123f1e79..40245778d5 100644
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -21,8 +21,9 @@
 #include <cmath>
 
 #include "canvas/canvas.h"
+#include "canvas/debug.h"
+#include "canvas/scroll_group.h"
 
-#include "utils.h"
 #include "editor_cursors.h"
 #include "editor.h"
 
@@ -32,73 +33,81 @@ using namespace Gtk;
 
 EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
 	: _editor (ed)
-	, _time_bars_canvas_item (_editor._time_bars_canvas->root ())
-	, _track_canvas_item (_editor._track_canvas->root ())
-	, _length (1.0)
+	, _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_cursor_scroll_group()))
 {
-	_time_bars_canvas_item.set_outline_width (1);
-	_track_canvas_item.set_outline_width (1);
-
-	for (int i = 0; i < 2; ++i) {
-		_time_bars_canvas_item.set_show_head (i, true);
-		_time_bars_canvas_item.set_head_height (i, 18);
-		_time_bars_canvas_item.set_head_width (i, 15);
-		_time_bars_canvas_item.set_head_outward (i, false);
-	}
+	CANVAS_DEBUG_NAME (_track_canvas_item, "track canvas editor cursor");
+
+	_track_canvas_item->set_show_head (0, true);
+	_track_canvas_item->set_head_height (0, 9);
+	_track_canvas_item->set_head_width (0, 16);
+	_track_canvas_item->set_head_outward (0, false);
+	_track_canvas_item->set_show_head (1, false); // head only
+	_track_canvas_item->set_data ("cursor", this);
+
+	_track_canvas_item->Event.connect (sigc::bind (sigc::mem_fun (ed, callbck), _track_canvas_item));
+
+	_track_canvas_item->set_y1 (ArdourCanvas::COORD_MAX);
+
+	_track_canvas_item->set_x (0);
+
+	_current_frame = 1; /* force redraw at 0 */
+}
 
-	_time_bars_canvas_item.set_data ("cursor", this);
-	_track_canvas_item.set_data ("cursor", this);
+EditorCursor::EditorCursor (Editor& ed)
+	: _editor (ed)
+	, _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_hscroll_group()))
+{
+	CANVAS_DEBUG_NAME (_track_canvas_item, "track canvas cursor");
 
-	_time_bars_canvas_item.Event.connect (sigc::bind (sigc::mem_fun (ed, callbck), &_time_bars_canvas_item));
-	_track_canvas_item.Event.connect (sigc::bind (sigc::mem_fun (ed, callbck), &_track_canvas_item));
+	_track_canvas_item->set_show_head (0, false);
+	_track_canvas_item->set_show_head (1, false);
+	_track_canvas_item->set_y1 (ArdourCanvas::COORD_MAX);
+	_track_canvas_item->set_ignore_events (true);
+
+	_track_canvas_item->set_x (0);
 
-	_time_bars_canvas_item.set_y1 (ArdourCanvas::COORD_MAX);
-	_track_canvas_item.set_y1 (ArdourCanvas::COORD_MAX);
-	
 	_current_frame = 1; /* force redraw at 0 */
 }
 
 EditorCursor::~EditorCursor ()
 {
-	
+	delete _track_canvas_item;
 }
 
 void
 EditorCursor::set_position (framepos_t frame)
 {
-	PositionChanged (frame);
+	if (_current_frame != frame) { PositionChanged (frame); }
 
-	double const new_pos = _editor.frame_to_unit (frame);
+	double const new_pos = _editor.sample_to_pixel_unrounded (frame);
 
-	if (new_pos != _time_bars_canvas_item.x ()) {
-		_time_bars_canvas_item.set_x (new_pos);
+	if (rint(new_pos) != rint(_track_canvas_item->x ())) {
+		_track_canvas_item->set_x (new_pos);
 	}
 
-	if (new_pos != _track_canvas_item.x0 ()) {
-		_track_canvas_item.set_x0 (new_pos);
-		_track_canvas_item.set_x1 (new_pos);
-	}
-	
 	_current_frame = frame;
 }
 
 void
 EditorCursor::show ()
 {
-	_time_bars_canvas_item.show ();
-	_track_canvas_item.show ();
+	_track_canvas_item->show ();
 }
 
 void
 EditorCursor::hide ()
 {
-	_time_bars_canvas_item.hide ();
-	_track_canvas_item.hide ();
+	_track_canvas_item->hide ();
 }
 
 void
 EditorCursor::set_color (ArdourCanvas::Color color)
 {
-	_time_bars_canvas_item.set_color (color);
-	_track_canvas_item.set_outline_color (color);
+	_track_canvas_item->set_color (color);
+}
+
+void
+EditorCursor::set_sensitive (bool yn)
+{
+	_track_canvas_item->set_ignore_events (!yn);
 }