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

Bug 1419 - Confusing and unnecessary widget change when clicking in Scrub Bar

Browse Source 
Behaviour now is still (in my view) confusing, but the widget does update when you click and release and haven't moved yet, which it didn't do before.
This commit is contained in:
James Crook 2016-08-11 17:58:51 +01:00
parent f7a85f4d52
commit eebe4a961e
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/widgets/Ruler.cpp
View File

@ -2357,9 +2357,15 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
auto &scrubber = mProject->GetScrubber();
if (scrubber.HasStartedScrubbing()) {
if (evt.RightDown())
if (evt.RightDown() )
// Fall through to context menu handling
;
else if ( evt.LeftUp() && inScrubZone)
// Fall through to seeking changes to scrubbing
;
// else if ( evt.LeftDown() && inScrubZone)
// // Fall through to ready to seek
// ;
else {
bool switchToQP = (zone == StatusChoice::EnteringQP && mQuickPlayEnabled);
if (switchToQP && evt.LeftDown()) {
@ -2429,13 +2435,26 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
&position);
return;
}
else if (!HasCapture() && inScrubZone) {
else if( !HasCapture() && evt.LeftUp() && inScrubZone ) {
//wxLogDebug("up");
// mouse going up => we shift to scrubbing.
scrubber.MarkScrubStart(evt.m_x,
TracksPrefs::GetPinnedHeadPreference(), false);
UpdateStatusBarAndTooltips(StatusChoice::EnteringScrubZone);
// repaint_all so that the indicator changes shape.
bool repaint_all = true;
ShowQuickPlayIndicator(repaint_all);
return;
}
else if ( !HasCapture() && inScrubZone) {
// mouse going down => we are (probably) seeking
if (evt.LeftDown()) {
//wxLogDebug("down");
scrubber.MarkScrubStart(evt.m_x,
TracksPrefs::GetPinnedHeadPreference(), false);
UpdateStatusBarAndTooltips(StatusChoice::EnteringScrubZone);
}
ShowQuickPlayIndicator();
ShowQuickPlayIndicator();
}
return;
}
else if ( mQuickPlayEnabled) {
@ -3191,18 +3210,18 @@ QuickPlayIndicatorOverlay *AdornedRulerPanel::GetOverlay()
return mOverlay.get();
}
void AdornedRulerPanel::ShowQuickPlayIndicator()
void AdornedRulerPanel::ShowQuickPlayIndicator( bool repaint_all)
{
ShowOrHideQuickPlayIndicator(true);
ShowOrHideQuickPlayIndicator(true, repaint_all);
}
void AdornedRulerPanel::HideQuickPlayIndicator()
void AdornedRulerPanel::HideQuickPlayIndicator(bool repaint_all)
{
ShowOrHideQuickPlayIndicator(false);
ShowOrHideQuickPlayIndicator(false, repaint_all);
}
// Draws the vertical line and green triangle indicating the Quick Play cursor position.
void AdornedRulerPanel::ShowOrHideQuickPlayIndicator(bool show)
void AdornedRulerPanel::ShowOrHideQuickPlayIndicator(bool show, bool repaint_all)
{
double latestEnd = std::max(mTracks->GetEndTime(), mProject->GetSel1());
if (!show || (mQuickPlayPos >= latestEnd)) {
@ -3216,8 +3235,8 @@ void AdornedRulerPanel::ShowOrHideQuickPlayIndicator(bool show)
GetOverlay()->Update(x, mIsSnapped, previewScrub);
}
mProject->GetTrackPanel()->DrawOverlays(false);
DrawOverlays(false);
mProject->GetTrackPanel()->DrawOverlays(repaint_all);
DrawOverlays(repaint_all);
}
void AdornedRulerPanel::SetPlayRegion(double playRegionStart,

6
src/widgets/Ruler.h
View File

@ -325,8 +325,8 @@ public:
void RegenerateTooltips(StatusChoice choice);
void ShowQuickPlayIndicator();
void HideQuickPlayIndicator();
void ShowQuickPlayIndicator( bool repaint_all=false);
void HideQuickPlayIndicator( bool repaint_all=false);
void UpdateQuickPlayPos(wxCoord &mousPosX);
bool ShowingScrubBar() const { return mShowScrubbing; }
@ -366,7 +366,7 @@ public:
private:
QuickPlayIndicatorOverlay *GetOverlay();
void ShowOrHideQuickPlayIndicator(bool show);
void ShowOrHideQuickPlayIndicator(bool show, bool repaint_all=false);
void DoDrawPlayRegion(wxDC * dc);
enum class MenuChoice { QuickPlay, Scrub };