diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-29 22:53:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-29 22:53:52 +0100 |
| commit | a85c82137ec26124ebefccb4aeebb96a3cdb8a4c (patch) | |
| tree | c1ab1cdc808198f9bec49553bb62c6f209887467 /src/wx/timeline.cc | |
| parent | d7c6347a250f618d5070d1264677010c8026d927 (diff) | |
Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption key.
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 9c70a001e..f1c6e30f3 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -363,7 +363,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) if (_snap) { - DCPTime const new_end = new_position + _down_view->content()->length_after_trim () - 1; + DCPTime const new_end = new_position + _down_view->content()->length_after_trim () - DCPTime (1); /* Signed `distance' to nearest thing (i.e. negative is left on the timeline, positive is right). */ @@ -377,9 +377,9 @@ Timeline::set_position_from_event (wxMouseEvent& ev) } maybe_snap (cv->content()->position(), new_position, nearest_distance); - maybe_snap (cv->content()->position(), new_end + 1, nearest_distance); - maybe_snap (cv->content()->end() + 1, new_position, nearest_distance); - maybe_snap (cv->content()->end() + 1, new_end, nearest_distance); + maybe_snap (cv->content()->position(), new_end + DCPTime (1), nearest_distance); + maybe_snap (cv->content()->end() + DCPTime (1), new_position, nearest_distance); + maybe_snap (cv->content()->end() + DCPTime (1), new_end, nearest_distance); } if (nearest_distance) { |