diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-25 14:47:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-25 14:47:43 +0100 |
| commit | b6c780d3107557d452c6612d715d01e2be52dbda (patch) | |
| tree | 3548fe3eef61f3b0145bb33a57a89f97bfa75f50 /src/wx/timeline.cc | |
| parent | e725a6b4bce2a05275ee611965c62d6803f3bf7c (diff) | |
| parent | 0dcbc398124f740e4fd7b552926f601a3e5c755e (diff) | |
Merge master.
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 13baef6b7..556e6f1b3 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -715,7 +715,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) DCPTime const d = DCPTime (cv->content()->end() - new_position).abs (); if (first || d < nearest_distance) { nearest_distance = d; - nearest_new_position = cv->content()->end(); + nearest_new_position = cv->content()->end() + DCPTime::delta (); } } @@ -727,7 +727,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) if (d < nearest_distance) { nearest_distance = d; - nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim (); + nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim () - DCPTime::delta(); } } |
