Merge pull request #1266 from tresf/stable-1.1

Fix automation cursor position issue
This commit is contained in:
Vesa V
2014-11-08 12:07:47 +02:00
2 changed files with 6 additions and 1 deletions

View File

@@ -62,6 +62,11 @@ public:
return getTact() * s_ticksPerTact;
}
MidiTime toAbsoluteTact() const
{
return getTact() * s_ticksPerTact;
}
MidiTime& operator=( const MidiTime& time )
{
m_ticks = time.m_ticks;

View File

@@ -174,7 +174,7 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
getTrackContentWidget()->x() ) *
MidiTime::ticksPerTact() /
static_cast<int>( trackContainerView()->pixelsPerTact() ) )
.toNearestTact();
.toAbsoluteTact();
if( pos.getTicks() < 0 )
{