Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8192/src
Modified Files:
TrackPanel.cpp
Log Message:
Prevent the play indicator line being drawn through the Track Info by checking
the x value.
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -d -r1.467 -r1.468
--- TrackPanel.cpp 12 Jul 2009 07:20:11 -0000 1.467
+++ TrackPanel.cpp 23 Jul 2009 01:56:16 -0000 1.468
@@ -1047,6 +1047,18 @@
// Calculate the horizontal position of the indicator
x = GetLeftOffset() + int ( ( pos - mViewInfo->h ) * mViewInfo->zoom );
+ mRuler->DrawIndicator( pos, rec );
+
+ // Ensure that we don't draw through the Track Info
+ wxRect clip = GetRect();
+ int leftCutoff = clip.x + GetLabelWidth();
+ int rightInset = kLeftInset + 2; // See the call to SetInset
+ int rightCutoff = clip.x + clip.width - rightInset;
+ if (!between_inclusive(leftCutoff, x, rightCutoff))
+ {
+ return;
+ }
+
// Draw indicator in all visible tracks
VisibleTrackIterator iter( GetProject() );
for( Track *t = iter.First(); t; t = iter.Next() )
@@ -1067,8 +1079,6 @@
x,
y + t->GetHeight() - 3 );
}
-
- mRuler->DrawIndicator( pos, rec );
}
/// This function draws the cursor things, both in the
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
