mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't let beat snap override region snap.

This commit is contained in:
Jonathan Moore Liles 2008-02-28 14:43:56 -06:00
parent 8f0fb79543
commit 84c4c93d6f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Track.C
View File

@ -116,16 +116,9 @@ Track::snap ( Track_Widget *r )
{ {
const int snap_pixels = 10; const int snap_pixels = 10;
int rx1 = r->x(); const int rx1 = r->x();
int rx2 = r->x() + r->w(); const int rx2 = r->x() + r->w();
int nx = timeline->nearest_line( r->abs_x() );
if ( nx >= 0 )
{
r->offset( timeline->x_to_ts( nx ) );
return;
}
for ( list <Track_Widget*>::iterator i = _widgets.begin(); i != _widgets.end(); i++ ) for ( list <Track_Widget*>::iterator i = _widgets.begin(); i != _widgets.end(); i++ )
{ {
@ -134,8 +127,8 @@ Track::snap ( Track_Widget *r )
if ( w == r ) if ( w == r )
continue; continue;
int wx1 = w->x(); const int wx1 = w->x();
int wx2 = w->x() + w->w(); const int wx2 = w->x() + w->w();
if ( abs( rx1 - wx2 ) < snap_pixels ) if ( abs( rx1 - wx2 ) < snap_pixels )
{ {
@ -156,6 +149,15 @@ Track::snap ( Track_Widget *r )
} }
} }
{
int nx = timeline->nearest_line( r->abs_x() );
if ( nx >= 0 )
{
r->offset( timeline->x_to_ts( nx ) );
return;
}
}
// r->offset( timeline->x_to_ts( r->x() ) ); // r->offset( timeline->x_to_ts( r->x() ) );
done: done: