X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=40245778d5b950dfc270f540c7484c79ddf8de06;hb=87c38e1a269e09b40e8e8866961498c36ce95fbb;hp=ffe6fc0d015a8df9ef6d87ab73f1058926478f45;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc index ffe6fc0d01..40245778d5 100644 --- a/gtk2_ardour/editor_cursors.cc +++ b/gtk2_ardour/editor_cursors.cc @@ -33,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"); @@ -48,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); }