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

Bug 2380 - Enh: Point label micro-range issue

Browse Source
This commit is contained in:
James Crook 2020-04-04 23:08:56 +01:00
parent 0523e292a3
commit b16251f0ed
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,6 +140,10 @@ void LabelGlyphHandle::HandleGlyphClick
// We move if we hit the centre, we adjust one edge if we hit a chevron. // We move if we hit the centre, we adjust one edge if we hit a chevron.
// This is if we are moving just one edge. // This is if we are moving just one edge.
hit.mbIsMoving = (hit.mEdge & 4)!=0; hit.mbIsMoving = (hit.mEdge & 4)!=0;
// No to the above! We initially expect to be moving just one edge.
hit.mbIsMoving = false;
// When we start dragging the label(s) we don't want them to jump. // When we start dragging the label(s) we don't want them to jump.
// so we calculate the displacement of the mouse from the drag center // so we calculate the displacement of the mouse from the drag center
// and use that in subsequent dragging calculations. The mouse stays // and use that in subsequent dragging calculations. The mouse stays
@ -160,11 +164,15 @@ void LabelGlyphHandle::HandleGlyphClick
{ {
t = (mLabels[ hit.mMouseOverLabelRight ].getT1() + t = (mLabels[ hit.mMouseOverLabelRight ].getT1() +
mLabels[ hit.mMouseOverLabelLeft ].getT0()) / 2.0f; mLabels[ hit.mMouseOverLabelLeft ].getT0()) / 2.0f;
// If we're moving two edges, then it's a move (label size preserved)
// if both edges are the same label, and it's an adjust (label sizes change) // If we're moving two edges of same label then it's a move
// if we're on a boundary between two different labels. // (label is shrunk to zero and size of zero is preserved)
hit.mbIsMoving = // If we're on a boundary between two different labels,
( hit.mMouseOverLabelLeft == hit.mMouseOverLabelRight ); // then it's an adjust.
// In both cases the two points coallesce.
hit.mbIsMoving = (hit.mMouseOverLabelLeft == hit.mMouseOverLabelRight);
MayAdjustLabel(hit, hit.mMouseOverLabelLeft, -1, false, t );
MayAdjustLabel(hit, hit.mMouseOverLabelRight, 1, false, t );
} }
else if( hit.mMouseOverLabelRight >=0) else if( hit.mMouseOverLabelRight >=0)
{ {
@ -321,7 +329,7 @@ bool LabelGlyphHandle::HandleGlyphDragRelease
// and if both edges the same, then we're always moving the label. // and if both edges the same, then we're always moving the label.
bool bLabelMoving = hit.mbIsMoving; bool bLabelMoving = hit.mbIsMoving;
bLabelMoving ^= evt.ShiftDown(); bLabelMoving ^= evt.ShiftDown();
bLabelMoving |= ( hit.mMouseOverLabelLeft == hit.mMouseOverLabelRight ); //bLabelMoving |= ( hit.mMouseOverLabelLeft == hit.mMouseOverLabelRight );
double fNewX = zoomInfo.PositionToTime(x, 0); double fNewX = zoomInfo.PositionToTime(x, 0);
if( bLabelMoving ) if( bLabelMoving )
{ {

4
src/tracks/labeltrack/ui/LabelTrackView.cpp
View File

@ -1120,8 +1120,8 @@ void LabelTrackView::OverGlyph(
{ {
result |= 4; result |= 4;
// If left and right co-incident at this resolution, then we drag both. // If left and right co-incident at this resolution, then we drag both.
// We could be a little less stringent about co-incidence here if we liked. // We were more stringent about co-incidence here in the past.
if( abs(labelStruct.x1-labelStruct.x) < 1.0 ) if( abs(labelStruct.x1-labelStruct.x) < 5.0 )
{ {
result |=1; result |=1;
hit.mMouseOverLabelLeft = i; hit.mMouseOverLabelLeft = i;