Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6509/src
Modified Files:
LabelTrack.cpp
Log Message:
Allow label track icons, text, and lines to be partially displayed as the track
scrolls off the screen or if the track is larger than the trackpanel
Index: LabelTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/LabelTrack.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- LabelTrack.cpp 1 Jun 2009 05:43:40 -0000 1.105
+++ LabelTrack.cpp 2 Jun 2009 06:35:51 -0000 1.106
@@ -479,13 +479,11 @@
{
// How far out from the centre line should the vertical lines
// start, i.e. what is the y position of the icon?
- // We addjust this slightly so that the line encroaches on
- // the icon slightly (there is white space in the design).
+ // We adjust this so that the line encroaches on the icon
+ // slightly (there is white space in the design).
const int yIconStart = y - (LabelTrack::mIconHeight
/2)+1+(LabelTrack::mTextHeight+3)/2;
const int yIconEnd = yIconStart + LabelTrack::mIconHeight-2;
- if (y<0)
- return;
// If y is positive then it is the center line for the
// Label.
if((x >= r.x) && (x <= (r.x+r.width)))
@@ -507,8 +505,6 @@
/// @param r the LabelTrack rectangle.
void LabelStruct::DrawGlyphs(wxDC & dc, const wxRect & r, int GlyphLeft, int
GlyphRight)
{
- if (y<0)
- return;
const int xHalfWidth=LabelTrack::mIconWidth/2;
const int yStart=y-LabelTrack::mIconHeight/2+(LabelTrack::mTextHeight+3)/2;
@@ -528,8 +524,6 @@
/// @param r the LabelTrack rectangle.
void LabelStruct::DrawText(wxDC & dc, const wxRect & r)
{
- if (y<0)
- return;
//If y is positive then it is the center line for the
//text we are about to draw.
@@ -550,8 +544,6 @@
void LabelStruct::DrawTextBox(wxDC & dc, const wxRect & r)
{
- if (y<0)
- return;
//If y is positive then it is the center line for the
//text we are about to draw.
const int yBarHeight=3;
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
