Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00
Code Issues Releases Wiki Activity

Bug1115: click below vertical ruler deselects track now, just as...

Browse Source 
... clicks below the control panel or the track area do.
This commit is contained in:
Paul Licameli 2015-08-03 16:56:03 -04:00
parent 971fd38615
commit 9bbbf555c5
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/TrackPanel.cpp
View File

@ -2169,11 +2169,6 @@ void TrackPanel::HandleSelect(wxMouseEvent & event)
// depending on the shift key. If not, cancel all selections.
if (t)
SelectionHandleClick(event, t, rect);
else {
SelectNone();
Refresh(false);
}
} else if (event.LeftUp() || event.RightUp()) {
if (mSnapManager) {
delete mSnapManager;
@ -5480,14 +5475,6 @@ void TrackPanel::HandleLabelClick(wxMouseEvent & event)
Track *t = FindTrack(event.m_x, event.m_y, true, true, &rect);
// AS: If the user clicked outside all tracks, make nothing
// selected.
if (!t) {
SelectNone();
Refresh(false);
return;
}
// LL: Check close box
if (isleft && CloseFunc(t, rect, event.m_x, event.m_y))
return;
@ -6668,12 +6655,13 @@ bool TrackPanel::HandleLabelTrackMouseEvent(LabelTrack * lTrack, wxRect &rect, w
void TrackPanel::HandleTrackSpecificMouseEvent(wxMouseEvent & event)
{
Track * pTrack;
Track * pControlTrack;
wxRect rTrack;
wxRect rLabel;
bool unsafe = IsUnsafe();
FindTrack(event.m_x, event.m_y, true, true, &rLabel);
pControlTrack = FindTrack(event.m_x, event.m_y, true, true, &rLabel);
pTrack = FindTrack(event.m_x, event.m_y, false, false, &rTrack);
//call HandleResize if I'm over the border area
@ -6686,6 +6674,15 @@ void TrackPanel::HandleTrackSpecificMouseEvent(wxMouseEvent & event)
return;
}
// AS: If the user clicked outside all tracks, make nothing
// selected.
if ((event.ButtonDown() || event.ButtonDClick()) &&
!(pTrack || pControlTrack)) {
SelectNone();
Refresh(false);
return;
}
//Determine if user clicked on the track's left-hand label
if (!mCapturedTrack && event.m_x < GetLeftOffset()) {
if (event.m_x >= GetVRulerOffset()) {