diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-12 11:09:49 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-12 11:09:49 -0400 |
| commit | ecfd2a74552a45781e4d57a09e73313cd8815a4d (patch) | |
| tree | fbd236dd6b63074b8bebe4aa6eb0b129236bff7a /gtk2_ardour/marker.cc | |
| parent | fcb423f3f69225e0be896cb10b34b9628ab666f2 (diff) | |
remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index e9fcb9112e..ed65cc221b 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -234,7 +234,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con } frame_position = frame; - unit_position = editor.frame_to_unit (frame); + unit_position = editor.frame_to_pixel (frame); unit_position -= _shift; group = new ArdourCanvas::Group (&parent, ArdourCanvas::Duple (unit_position, 0)); @@ -429,7 +429,7 @@ Marker::setup_name_display () void Marker::set_position (framepos_t frame) { - unit_position = editor.frame_to_unit (frame) - _shift; + unit_position = editor.frame_to_pixel (frame) - _shift; group->set_x_position (unit_position); frame_position = frame; } |