integrated pitanga's patch to fix unquantized BB dragging in song editor. Changed ctrl modifier to alt to be consistent (stable backport)

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@2008 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2009-02-05 13:23:32 +00:00
parent d3e6f5a348
commit 48990656b9
2 changed files with 16 additions and 5 deletions

View File

@@ -49,6 +49,12 @@
* CMakeLists.txt:
fixed plugins/ directory when updating localization file
* src/core/track.cpp:
integrated pitanga's patch to fix unquantized BB dragging in
song editor. Changed ctrl modifier to alt to be consistent.
2009-02-01 Andrew Kelley <superjoe30/at/gmail/dot/com>
* plugins/flp_import/flp_import.cpp:
in FL_EffectChannel initialize isMuted member - fixes muted FX channels
when importing older FLP files

View File

@@ -684,7 +684,7 @@ void trackContentObjectView::mouseMoveEvent( QMouseEvent * _me )
QVector<selectableObject *> so =
m_trackView->getTrackContainerView()->selectedObjects();
QVector<trackContentObject *> tcos;
midiTime smallest_pos;
midiTime smallest_pos, t;
// find out smallest position of all selected objects for not
// moving an object before zero
for( QVector<selectableObject *>::iterator it = so.begin();
@@ -706,10 +706,15 @@ void trackContentObjectView::mouseMoveEvent( QMouseEvent * _me )
for( QVector<trackContentObject *>::iterator it = tcos.begin();
it != tcos.end(); ++it )
{
( *it )->movePosition( ( *it )->startPosition() +
static_cast<int>( dx *
midiTime::ticksPerTact() / ppt ) -
smallest_pos );
t = ( *it )->startPosition() +
static_cast<int>( dx *midiTime::ticksPerTact() /
ppt )-smallest_pos;
if( ! ( _me->modifiers() & Qt::AltModifier )
&& _me->button() == Qt::NoButton )
{
t = t.toNearestTact();
}
( *it )->movePosition( t );
}
}
else if( m_action == Resize )