diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-06 23:42:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-06 23:42:07 +0000 |
| commit | 2dd0b9321c87838e9f2276c02f5942daac2b836e (patch) | |
| tree | 662e7204c0d3a3eea3183a9407a6b46871d0d152 /gtk2_ardour/editor_rulers.cc | |
| parent | facf6168681010134085145b5b480d864d780cd4 (diff) | |
modified fix from carl for region copy-moves-original-to-start bug; change verbose canvas cursor color to be more distinct and readable; fix naming issues with imported files containing ':'; make sure [N] channels count shows up for whole files in region list; fix #1575, a subtle and nasty bug; improve positioning of verbose canvas cursor for ruler drags (but has a wierd side effect
git-svn-id: svn://localhost/ardour2/trunk@1675 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 6338993ae2..992d67b9be 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -260,12 +260,12 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev) /* need to use the correct x,y, the event lies */ time_canvas_event_box.get_window()->get_pointer (x, y, state); - - track_canvas.c2w (x, y, wcx, wcy); - track_canvas.w2c (wcx, wcy, cx, cy); - - nframes_t where = leftmost_frame + pixel_to_frame (x); + time_canvas.c2w (x, y, wcx, wcy); + time_canvas.w2c (wcx, wcy, cx, cy); + wcx = x; + nframes_t where = event_frame ((GdkEvent*) ev, &wcx, (double *) 0); + cx = wcx; /// ripped from maybe_autoscroll, and adapted to work here nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit); @@ -307,8 +307,7 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev) break; } - if (cursor) - { + if (cursor) { cursor->set_position (where); if (cursor == edit_cursor) { |