Oh, oh. I bet I did that. Sorry!!!!!
That's what happens when I do something and don't commit right away. When I
get back to it, I try to re-incorporate the changes into the current sources
and this is what usually happens. :-(
Leland
On 9/26/06 1:23 PM, "Markus Meyer" <[EMAIL PROTECTED]> wrote:
> Update of /cvsroot/audacity/audacity-src/src
> In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12826
>
> Modified Files:
> TrackPanel.cpp
> Log Message:
> Fix multi-tool slide behaviour regression
>
> Index: TrackPanel.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
> retrieving revision 1.326
> retrieving revision 1.327
> diff -u -d -r1.326 -r1.327
> --- TrackPanel.cpp 16 Sep 2006 05:54:36 -0000 1.326
> +++ TrackPanel.cpp 26 Sep 2006 18:23:12 -0000 1.327
> @@ -1951,8 +1951,7 @@
> ToolsToolBar * ttb = mListener->TP_GetToolsToolBar();
> bool multiToolModeActive = (ttb && ttb->IsDown(multiTool));
>
> - if (vt->GetKind() == Track::Wave && !event.ShiftDown() &&
> - ((event.ControlDown() && event.ShiftDown()) || !multiToolModeActive))
> + if (vt->GetKind() == Track::Wave && !event.ShiftDown())
> {
> WaveTrack* wt = (WaveTrack*)vt;
> mCapturedClip = wt->GetClipAtX(event.m_x);
> @@ -3979,8 +3978,9 @@
> // From here on the order in which we hit test determines
> // which tool takes priority in the rare cases where it
> // could be more than one.
> - } else if (event.ControlDown() && event.ShiftDown()){
> - // msmeyer: If control and shift are down, slide single clip
> + } else if (event.ControlDown()){
> + // msmeyer: If control is down, slide single clip
> + // msmeyer: If control and shift are down, slide all clips
> currentTool = slideTool;
> } else if( HitTestEnvelope( pTrack, r, event ) ){
> currentTool = envelopeTool;
>
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys -- and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Audacity-cvs mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/audacity-cvs
>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
