Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16369/src
Modified Files:
TrackPanel.cpp
Log Message:
Should fix mouse click detection in the label area when mouse is over second
track of linked tracks.
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -d -r1.480 -r1.481
--- TrackPanel.cpp 3 Nov 2009 19:34:43 -0000 1.480
+++ TrackPanel.cpp 23 Nov 2009 03:50:47 -0000 1.481
@@ -3696,7 +3696,7 @@
return;
// LL: Check title bar for popup
- if (isleft &&PopupFunc(t, r, event.m_x, event.m_y))
+ if (isleft && PopupFunc(t, r, event.m_x, event.m_y))
return;
// MM: Check minimize buttons on WaveTracks. Must be before
@@ -6816,13 +6816,18 @@
}
VisibleTrackIterator iter(GetProject());
-
for (Track * t = iter.First(); t; t = iter.Next()) {
r.y = t->GetY() - mViewInfo->vpos + kTopInset;
r.height = t->GetHeight();
- if (link && t->GetLinked()) {
- r.height += t->GetLink()->GetHeight();
+ if (link && t->GetLink()) {
+ Track *l = t->GetLink();
+ int h = l->GetHeight();
+ if (!t->GetLinked()) {
+ t = l;
+ r.y = t->GetY() - mViewInfo->vpos + kTopInset;;
+ }
+ r.height += h;
}
//Determine whether the mouse is inside
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
