From 356fdeba406580fb3b6508123b52947bd27655c3 Mon Sep 17 00:00:00 2001 From: James Crook Date: Fri, 29 Jun 2018 17:00:25 +0100 Subject: [PATCH] Show Pin/Unpin button in red, if recording. --- src/widgets/Ruler.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index df8627245..5a96ea8fc 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -2144,6 +2144,20 @@ void AdornedRulerPanel::ReCreateButtons() return button; }; auto button = buttonMaker(OnTogglePinnedStateID, bmpPlayPointerPinned, true); + ToolBar::MakeAlternateImages( + *button, 3, + bmpRecoloredUpSmall, bmpRecoloredDownSmall, + bmpRecoloredUpHiliteSmall, bmpRecoloredHiliteSmall, + //bmpUnpinnedPlayHead, bmpUnpinnedPlayHead, bmpUnpinnedPlayHead, + bmpRecordPointer, bmpRecordPointer, bmpRecordPointer, + size); + ToolBar::MakeAlternateImages( + *button, 2, + bmpRecoloredUpSmall, bmpRecoloredDownSmall, + bmpRecoloredUpHiliteSmall, bmpRecoloredHiliteSmall, + //bmpUnpinnedPlayHead, bmpUnpinnedPlayHead, bmpUnpinnedPlayHead, + bmpRecordPointerPinned, bmpRecordPointerPinned, bmpRecordPointerPinned, + size); ToolBar::MakeAlternateImages( *button, 1, bmpRecoloredUpSmall, bmpRecoloredDownSmall, @@ -2257,6 +2271,7 @@ void AdornedRulerPanel::OnCapture(wxCommandEvent & evt) // if recording is initiated by a modal window (Timer Record). SetCursor(mCursorDefault); mIsRecording = true; + UpdateButtonStates(); // The quick play indicator is useless during recording HideQuickPlayIndicator(); @@ -2264,6 +2279,7 @@ void AdornedRulerPanel::OnCapture(wxCommandEvent & evt) else { SetCursor(mCursorHand); mIsRecording = false; + UpdateButtonStates(); } RegenerateTooltips(mPrevZone); } @@ -2926,7 +2942,7 @@ void AdornedRulerPanel::UpdateButtonStates() pinButton->PopUp(); else pinButton->PushDown(); - pinButton->SetAlternateIdx(state ? 0 : 1); + pinButton->SetAlternateIdx((mIsRecording ? 2 : 0) + (state ? 0 : 1)); // Bug 1584: Toltip now shows what clicking will do. const auto label = state ? _("Click to unpin")