Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-24 16:20:05 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into scrubbing2

Browse Source
This commit is contained in:
Paul Licameli 2016-06-02 15:28:12 -04:00
commit 03fd92d541
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/widgets/Ruler.cpp
View File

@ -1956,6 +1956,9 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent,
, mProject(parent)
, mViewInfo(viewinfo)
{
for (auto &button : mButtons)
button = nullptr;
ReCreateButtons();
SetLabel( _("Timeline") );
@ -2764,18 +2767,20 @@ void AdornedRulerPanel::OnContextMenu(wxContextMenuEvent & WXUNUSED(event))
void AdornedRulerPanel::UpdateButtonStates()
{
bool state = PlaybackPrefs::GetPinnedHeadPreference();
auto pinButton = static_cast<AButton*>(FindWindow(OnTogglePinnedStateID));
pinButton->PopUp();
pinButton->SetAlternateIdx(state ? 0 : 1);
const auto label = state
{
bool state = PlaybackPrefs::GetPinnedHeadPreference();
auto pinButton = static_cast<AButton*>(FindWindow(OnTogglePinnedStateID));
pinButton->PopUp();
pinButton->SetAlternateIdx(state ? 0 : 1);
const auto label = state
// Label descibes the present state, not what the click does
// (which is, to toggle the state)
? _("Pinned play/record Head")
: _("Unpinned play/record Head");
const auto &fullLabel = ComposeButtonLabel(*mProject, _("PinnedHead"), label);
pinButton->SetLabel(fullLabel);
pinButton->SetToolTip(fullLabel);
const auto &fullLabel = ComposeButtonLabel(*mProject, wxT("PinnedHead"), label);
pinButton->SetLabel(fullLabel);
pinButton->SetToolTip(fullLabel);
}
}
void AdornedRulerPanel::OnTogglePinnedState(wxCommandEvent & event)

2
src/widgets/Ruler.h
View File

@ -446,7 +446,7 @@ private:
friend QuickPlayRulerOverlay;
wxWindow *mButtons[1] { {} };
wxWindow *mButtons[1];
bool mNeedButtonUpdate { true };
};