From b3208ab12d364abddf13ba107937ac46633276d6 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 27 Jun 2017 22:35:19 -0400 Subject: [PATCH] Restore status message "Click and drag to select audio" --- src/tracks/ui/SelectHandle.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp index 6e29a528c..c3fe2b230 100644 --- a/src/tracks/ui/SelectHandle.cpp +++ b/src/tracks/ui/SelectHandle.cpp @@ -469,6 +469,12 @@ HitTestResult SelectHandle::HitTest MaySetOnDemandTip(pTrack, tip); + if (tip == "") { + const auto ttb = pProject->GetToolsToolBar(); + if (ttb) + tip = ttb->GetMessageForTool(selectTool); + } + return HitTestResult{ { tip, pCursor }, &Instance() }; } @@ -852,7 +858,7 @@ UIHandle::Result SelectHandle::Drag } HitTestPreview SelectHandle::Preview -(const TrackPanelMouseEvent &, const AudacityProject *) +(const TrackPanelMouseEvent &, const AudacityProject *pProject) { wxString tip; wxCursor *pCursor; @@ -860,6 +866,11 @@ HitTestPreview SelectHandle::Preview (SelectionBoundary(mSelectionBoundary), (mFreqSelMode == FREQ_SEL_SNAPPING_CENTER), tip, pCursor); + if (tip == "") { + const auto ttb = pProject->GetToolsToolBar(); + if (ttb) + tip = ttb->GetMessageForTool(selectTool); + } return { tip, pCursor }; }