diff --git a/src/menus/ClipMenus.cpp b/src/menus/ClipMenus.cpp index 885de58ca..41da0d3a8 100644 --- a/src/menus/ClipMenus.cpp +++ b/src/menus/ClipMenus.cpp @@ -643,7 +643,8 @@ double DoClipMove( AudacityProject &project, Track *track, // Find the first channel that has a clip at time t0 for (auto channel : TrackList::Channels(track) ) { uShifter = MakeTrackShifter::Call( *track, project ); - if( uShifter->HitTest( t0 ) == TrackShifter::HitTestResult::Miss ) + if ( uShifter->HitTest( t0, viewInfo ) == + TrackShifter::HitTestResult::Miss ) uShifter.reset(); else break; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp index ae5753a72..52295f68a 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp @@ -742,7 +742,7 @@ public: ~NoteTrackShifter() override {} Track &GetTrack() const override { return *mpTrack; } - HitTestResult HitTest( double, HitTestParams* ) override + HitTestResult HitTest( double, const ViewInfo&, HitTestParams* ) override { return HitTestResult::Intervals; } diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp index a5f4c0482..f9a5844fa 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp @@ -1314,7 +1314,8 @@ public: ~WaveTrackShifter() override {} Track &GetTrack() const override { return *mpTrack; } - HitTestResult HitTest( double time, HitTestParams* ) override + HitTestResult HitTest( + double time, const ViewInfo&, HitTestParams* ) override { auto pClip = mpTrack->GetClipAtTime( time ); diff --git a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp index ff495e2ad..06cb2fd49 100644 --- a/src/tracks/ui/TimeShiftHandle.cpp +++ b/src/tracks/ui/TimeShiftHandle.cpp @@ -241,7 +241,8 @@ CoarseTrackShifter::CoarseTrackShifter( Track &track ) CoarseTrackShifter::~CoarseTrackShifter() = default; -auto CoarseTrackShifter::HitTest( double, HitTestParams* ) -> HitTestResult +auto CoarseTrackShifter::HitTest( + double, const ViewInfo&, HitTestParams* ) -> HitTestResult { return HitTestResult::Track; } @@ -466,7 +467,7 @@ UIHandle::Result TimeShiftHandle::Click TrackShifter::HitTestParams params{ rect, event.m_x, event.m_y }; - switch( pShifter->HitTest( clickTime, ¶ms ) ) { + switch( pShifter->HitTest( clickTime, viewInfo, ¶ms ) ) { case TrackShifter::HitTestResult::Miss: return Cancelled; case TrackShifter::HitTestResult::Intervals: { diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h index fde2da10f..672d46f4a 100644 --- a/src/tracks/ui/TimeShiftHandle.h +++ b/src/tracks/ui/TimeShiftHandle.h @@ -54,6 +54,7 @@ public: */ virtual HitTestResult HitTest( double time, //!< A time value to test + const ViewInfo &viewInfo, HitTestParams *pParams = nullptr //!< Optional extra information ) = 0; @@ -172,7 +173,7 @@ public: ~CoarseTrackShifter() override; Track &GetTrack() const override { return *mpTrack; } - HitTestResult HitTest( double, HitTestParams* ) override; + HitTestResult HitTest( double, const ViewInfo&, HitTestParams* ) override; //! Returns false bool SyncLocks() override;