Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-02 17:23:18 +02:00
Code Issues Releases Wiki Activity

Bug 2380 - Residual: Possible to create micro-labels with shift+drag

Browse Source 
Shift+Drag of a point could convert the point to a micro range label.
That's fixed now.  Shift+Drag on an existing micro label will now preserve
that label's length, without coalescing the spots.  That's intended, and
is needed for advanced users who use shift-drag to preserve length.
This commit is contained in:
James Crook 2020-04-17 15:08:24 +01:00
parent 0b716cabee
commit 5c382be484
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
View File

@ -171,10 +171,16 @@ void LabelGlyphHandle::HandleGlyphClick
// then it's an adjust.
// In both cases the two points coalesce.
hit.mbIsMoving = (hit.mMouseOverLabelLeft == hit.mMouseOverLabelRight);
MayAdjustLabel(hit, hit.mMouseOverLabelLeft, -1, false, t );
MayAdjustLabel(hit, hit.mMouseOverLabelRight, 1, false, t );
wxASSERT(mLabels[hit.mMouseOverLabelRight].getT1() ==
mLabels[hit.mMouseOverLabelLeft].getT0());
// Except! We don't coalesce if both ends are from the same label and
// we have deliberately chosen to preserve length, by holding shift down.
if (!(hit.mbIsMoving && evt.ShiftDown()))
{
MayAdjustLabel(hit, hit.mMouseOverLabelLeft, -1, false, t);
MayAdjustLabel(hit, hit.mMouseOverLabelRight, 1, false, t);
wxASSERT(mLabels[hit.mMouseOverLabelRight].getT1() ==
mLabels[hit.mMouseOverLabelLeft].getT0());
}
}
else if( hit.mMouseOverLabelRight >=0)
{
@ -331,7 +337,7 @@ bool LabelGlyphHandle::HandleGlyphDragRelease
// and if both edges the same, then we're always moving the label.
bool bLabelMoving = hit.mbIsMoving;
bLabelMoving ^= evt.ShiftDown();
//bLabelMoving |= ( hit.mMouseOverLabelLeft == hit.mMouseOverLabelRight );
bLabelMoving |= ( hit.mMouseOverLabelLeft == hit.mMouseOverLabelRight );
double fNewX = zoomInfo.PositionToTime(x, 0);
if( bLabelMoving )
{