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

Remove GetActiveProject from SelectHandle

Browse Source
This commit is contained in:
Paul Licameli 2019-05-21 13:36:29 -04:00
parent 02e5b8db07
commit 9029eee5bd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tracks/ui/SelectHandle.cpp
View File

@ -487,12 +487,12 @@ namespace {
} }
} }
void SelectHandle::Enter(bool, AudacityProject *) void SelectHandle::Enter(bool, AudacityProject *project)
{ {
SetUseSnap(true); SetUseSnap(true, project);
} }
void SelectHandle::SetUseSnap(bool use) void SelectHandle::SetUseSnap(bool use, AudacityProject *project)
{ {
mUseSnap = use; mUseSnap = use;
@ -504,7 +504,7 @@ void SelectHandle::SetUseSnap(bool use)
if (IsClicked()) { if (IsClicked()) {
// Readjust the moving selection end // Readjust the moving selection end
AssignSelection( AssignSelection(
ViewInfo::Get( *::GetActiveProject() ), ViewInfo::Get( *project ),
mUseSnap ? mSnapEnd.outTime : mSnapEnd.timeSnappedTime, mUseSnap ? mSnapEnd.outTime : mSnapEnd.timeSnappedTime,
nullptr); nullptr);
} }
@ -521,10 +521,10 @@ bool SelectHandle::HasEscape() const
return HasSnap() && mUseSnap; return HasSnap() && mUseSnap;
} }
bool SelectHandle::Escape(AudacityProject *) bool SelectHandle::Escape(AudacityProject *project)
{ {
if (SelectHandle::HasEscape()) { if (SelectHandle::HasEscape()) {
SetUseSnap(false); SetUseSnap(false, project);
return true; return true;
} }
return false; return false;

6
src/tracks/ui/SelectHandle.h
View File

@ -50,13 +50,13 @@ public:
bool IsClicked() const; bool IsClicked() const;
void SetUseSnap(bool use); void SetUseSnap(bool use, AudacityProject *pProject);
void Enter(bool forward, AudacityProject *) override; void Enter(bool forward, AudacityProject *pProject) override;
bool HasSnap() const; bool HasSnap() const;
bool HasEscape() const override; bool HasEscape() const override;
bool Escape(AudacityProject *) override; bool Escape(AudacityProject *pProject) override;
Result Click Result Click
(const TrackPanelMouseEvent &event, AudacityProject *pProject) override; (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;