From 1ad878771feb50c88ad2ccab5c43cca13eaf83b1 Mon Sep 17 00:00:00 2001 From: Steve Daulton Date: Fri, 1 May 2015 14:55:04 +0100 Subject: [PATCH] Update a couple of variable names. --- src/widgets/Ruler.cpp | 12 ++++++------ src/widgets/Ruler.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index b5460e652..f9dbca7f3 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -1847,7 +1847,7 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt) bool isWithinStart = IsWithinMarker(mousePosX, mPlayRegionStart); bool isWithinEnd = IsWithinMarker(mousePosX, mPlayRegionEnd); - bool canDragLoopSel = !mPlayRegionLock && mPlayRegionDragsSelection; + bool canDragSel = !mPlayRegionLock && mPlayRegionDragsSelection; mLastMouseX = mousePosX; @@ -1949,15 +1949,15 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt) break; case mesDraggingPlayRegionStart: mPlayRegionStart = mQuickPlayPos; - if (canDragLoopSel) { - DragLoopSelection(); + if (canDragSel) { + DragSelection(); } Refresh(); break; case mesDraggingPlayRegionEnd: mPlayRegionEnd = mQuickPlayPos; - if (canDragLoopSel) { - DragLoopSelection(); + if (canDragSel) { + DragSelection(); } Refresh(); break; @@ -2152,7 +2152,7 @@ void AdornedRulerPanel::OnSyncSelToQuickPlay(wxCommandEvent& evt) gPrefs->Flush(); } -void AdornedRulerPanel::DragLoopSelection() +void AdornedRulerPanel::DragSelection() { if (mPlayRegionStart < mPlayRegionEnd) { mProject->SetSel0(mPlayRegionStart); diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h index 5ed563e40..7b3197d90 100644 --- a/src/widgets/Ruler.h +++ b/src/widgets/Ruler.h @@ -326,7 +326,7 @@ private: // Pop-up menu // void ShowMenu(const wxPoint & pos); - void DragLoopSelection(); + void DragSelection(); void OnToggleQuickPlay(wxCommandEvent &evt); void OnSyncSelToQuickPlay(wxCommandEvent &evt); void OnTimelineToolTips(wxCommandEvent &evt);