diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 21:27:39 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 21:27:39 +0000 |
| commit | c86210a9d5bdb7b36ad58552a1f99f53d48781b3 (patch) | |
| tree | 6ab06935a1e2bc4ef6a4448dd01b09f5b2628c66 /gtk2_ardour/editor_cursors.cc | |
| parent | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (diff) | |
merge 2.0-ongoing into 3.0 @ 3581 - 3710
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_cursors.cc')
| -rw-r--r-- | gtk2_ardour/editor_cursors.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc index 54786bcebf..ca00ec61d2 100644 --- a/gtk2_ardour/editor_cursors.cc +++ b/gtk2_ardour/editor_cursors.cc @@ -38,8 +38,8 @@ Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanv /* "randomly" initialize coords */ - points.push_back(Gnome::Art::Point(-9383839.0, 0.0)); points.push_back(Gnome::Art::Point(1.0, 0.0)); + points.push_back(Gnome::Art::Point(1.0, 1.0)); canvas_item.property_points() = points; canvas_item.property_width_pixels() = 1; @@ -51,7 +51,6 @@ Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanv canvas_item.set_data ("cursor", this); canvas_item.signal_event().connect (bind (mem_fun (ed, callbck), &canvas_item)); - current_frame = 1; /* force redraw at 0 */ } @@ -67,23 +66,15 @@ Editor::Cursor::set_position (nframes64_t frame) if (editor.session == 0) { canvas_item.hide(); - } else { - canvas_item.show(); } - current_frame = frame; - if (new_pos != points.front().get_x()) { points.front().set_x (new_pos); points.back().set_x (new_pos); canvas_item.property_points() = points; - - ArdourCanvas::Points p = canvas_item.property_points(); } - - canvas_item.raise_to_top(); } void @@ -92,6 +83,9 @@ Editor::Cursor::set_length (double units) length = units; points.back().set_y (points.front().get_y() + length); canvas_item.property_points() = points; + if (editor.session != 0) { + canvas_item.show(); + } } void |