Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5765
Modified Files:
Project.cpp
Log Message:
Apply patches from Al Dimond to:
* fix mouse pointer separating from clip when dragging the last clip in the
timeline, and prevent change of timeline when dragging that last clip
* use TrackPanel::ScrollIntoView() to prevent space at end of track being
removed wheh hitting END
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -d -r1.461 -r1.462
--- Project.cpp 11 Oct 2009 19:31:09 -0000 1.461
+++ Project.cpp 14 Oct 2009 21:48:10 -0000 1.462
@@ -1293,9 +1293,9 @@
mViewInfo.screen = ((double) panelWidth) / mViewInfo.zoom;
mViewInfo.total = mTracks->GetEndTime() + mViewInfo.screen / 4;
+ // Don't remove time from total that's still on the screen
if (mViewInfo.h > mViewInfo.total - mViewInfo.screen) {
- mViewInfo.h = mViewInfo.total - mViewInfo.screen;
- rescroll = true;
+ mViewInfo.total = mViewInfo.h + mViewInfo.screen;
}
if (mViewInfo.h < 0.0) {
mViewInfo.h = 0.0;
@@ -3616,20 +3616,9 @@
if (!shift || mViewInfo.sel0 > mViewInfo.sel1)
mViewInfo.sel0 = len;
- //STM: Determine wisely where to position the viewport
- // There are two conditions:
- //
- // (1) If the total width of the sample is larger than the viewport
- // is wide, sets the viewport so that the end of the sample will
- // have about 5% empty space after it
- // (2) If the total width of the sample is less than the viewport is
- // wide, set the viewport's left edge to be 0.
-
- //Calculates viewstart: End of sample - 95% of a screen width
- double viewstart = len - mViewInfo.screen * .95;
- viewstart = viewstart > 0 ? viewstart : 0.0;
-
- TP_ScrollWindow(viewstart);
+ // Make sure the end of the track is visible
+ mTrackPanel->ScrollIntoView(len);
+ mTrackPanel->Refresh(false);
}
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
