Fix session-open after selecting new, template, then back

[ardour.git] / gtk2_ardour / editor_cursors.cc

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index dd9970c730e80ac912a713053d265fb169f32b40..de89274fcc9f7c4372dcb0d9d161e6e75538cc0b 100644 (file)
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -24,7 +24,6 @@
 #include "canvas/debug.h"
 #include "canvas/scroll_group.h"
 
-#include "utils.h"
 #include "editor_cursors.h"
 #include "editor.h"
 
@@ -34,8 +33,7 @@ using namespace Gtk;
 
 EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
        : _editor (ed)
-       , _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_hscroll_group()))
-       , _length (1.0)
+       , _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_cursor_scroll_group()))
 {
        CANVAS_DEBUG_NAME (_track_canvas_item, "track canvas editor cursor");
 
@@ -49,23 +47,41 @@ EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,Ardour
        _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 */
+}
+
+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");
+
+       _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);
+
        _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.sample_to_pixel_unrounded (frame);
 
-       if (new_pos != _track_canvas_item->x ()) {
+       if (rint(new_pos) != rint(_track_canvas_item->x ())) {
                _track_canvas_item->set_x (new_pos);
        }
 
@@ -85,7 +101,13 @@ EditorCursor::hide ()
 }
 
 void
-EditorCursor::set_color (ArdourCanvas::Color color)
+EditorCursor::set_color (Gtkmm2ext::Color color)
 {
        _track_canvas_item->set_color (color);
 }
+
+void
+EditorCursor::set_sensitive (bool yn)
+{
+       _track_canvas_item->set_ignore_events (!yn);
+}