From fcfbd65268cbba8b1fd1cebc32654a43ba051d1a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Nov 2010 13:36:38 +0000 Subject: Further fixes for #3529. Show marker lines the same colour as their marker; adjust height of lines. git-svn-id: svn://localhost/ardour2/branches/3.0@8009 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_drag.cc | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/editor_drag.cc') diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 45d67605b4..71dda34d63 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1756,8 +1756,15 @@ MeterMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) // The actual copying is not done before we reach the finish callback. char name[64]; snprintf (name, sizeof(name), "%g/%g", _marker->meter().beats_per_bar(), _marker->meter().note_divisor ()); - MeterMarker* new_marker = new MeterMarker(*_editor, *_editor->meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), name, - *new MeterSection (_marker->meter())); + + MeterMarker* new_marker = new MeterMarker ( + *_editor, + *_editor->meter_group, + *_editor->cursor_group, + ARDOUR_UI::config()->canvasvar_MeterMarker.get(), + name, + *new MeterSection (_marker->meter()) + ); _item = &new_marker->the_item (); _marker = new_marker; @@ -1850,8 +1857,15 @@ TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) // The actual copying is not done before we reach the finish callback. char name[64]; snprintf (name, sizeof (name), "%.2f", _marker->tempo().beats_per_minute()); - TempoMarker* new_marker = new TempoMarker(*_editor, *_editor->tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), name, - *new TempoSection (_marker->tempo())); + + TempoMarker* new_marker = new TempoMarker ( + *_editor, + *_editor->tempo_group, + *_editor->cursor_group, + ARDOUR_UI::config()->canvasvar_TempoMarker.get(), + name, + *new TempoSection (_marker->tempo()) + ); _item = &new_marker->the_item (); _marker = new_marker; -- cgit v1.2.3