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

Changed misleading terminology in scrubber...

Browse Source 
... It was confusing that HasStartedScrubbing() could be true
while also not IsScrubbing()
This commit is contained in:
Paul Licameli
2018-07-29 14:11:17 -04:00
parent b33d3516f0
commit 5f27ae905c
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/Ruler.cpp
View File

@@ -2216,7 +2216,7 @@ namespace {
const wxString ScrubbingMessage(const Scrubber &scrubber)
{
if (scrubber.HasStartedScrubbing())
if (scrubber.HasMark())
return ContinueScrubbingMessage(scrubber);
else
return StartScrubbingMessage(scrubber);
@@ -2450,7 +2450,7 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
mPrevZone = zone;
auto &scrubber = mProject->GetScrubber();
if (scrubber.HasStartedScrubbing()) {
if (scrubber.HasMark()) {
if (evt.RightDown() )
// Fall through to context menu handling
;
@@ -2863,7 +2863,7 @@ void AdornedRulerPanel::UpdateStatusBarAndTooltips(StatusChoice choice)
wxString message {};
const auto &scrubber = mProject->GetScrubber();
const bool scrubbing = scrubber.HasStartedScrubbing();
const bool scrubbing = scrubber.HasMark();
if (scrubbing && choice != StatusChoice::Leaving)
// Don't distinguish zones
choice = StatusChoice::EnteringScrubZone;
@@ -2922,7 +2922,7 @@ bool AdornedRulerPanel::ShowingScrubControl() const
return
mMouseEventState == AdornedRulerPanel::mesNone &&
(mPrevZone == AdornedRulerPanel::StatusChoice::EnteringScrubZone ||
(scrubber.HasStartedScrubbing()));
(scrubber.HasMark()));
}
void AdornedRulerPanel::OnContextMenu(wxContextMenuEvent & WXUNUSED(event))