From e255351ea6ed4ab18ecca3d77262a494e9d65b87 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 27 Sep 2020 23:41:25 +0200 Subject: [PATCH] Tweak trim-to-end behaviour and button label. Now this button trims the current frame and all following (#1831). It seems to be likely that you'd be looking at something you want to remove, not the thing before what you want to remove. --- src/wx/timing_panel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index c4234af66..9bf4cacf7 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -105,7 +105,7 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) _trim_start_to_playhead = new Button (this, _("Trim up to current position")); _trim_end_label = create_label (this, _("Trim from end"), true); _trim_end = new Timecode (this); - _trim_end_to_playhead = new Button (this, _("Trim after current position")); + _trim_end_to_playhead = new Button (this, _("Trim from current position to end")); _play_length_label = create_label (this, _("Play length"), true); _play_length = new Timecode (this); @@ -583,7 +583,7 @@ TimingPanel::trim_end_to_playhead_clicked () BOOST_FOREACH (shared_ptr i, _parent->selected ()) { if (i->position() < ph && ph < i->end(film)) { FrameRateChange const frc = film->active_frame_rate_change (i->position ()); - i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph - DCPTime::from_frames(1, frc.dcp), frc) - i->trim_start()); + i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph, frc) - i->trim_start()); } } } -- 2.30.2