hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #988 from diizy/stable-1.1

Browse Source 
Add safeguard for beat pattern wheelevent
This commit is contained in:
Vesa V
2014-07-14 00:39:07 +03:00
parent 5978cd597e d4e30d5ff8
commit 1eed43c55e
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/tracks/pattern.cpp
View File

@@ -855,27 +855,27 @@ void patternView::wheelEvent( QWheelEvent * _we )
{
vol = n->getVolume();
len = n->length();
}
if( len == 0 && _we->delta() > 0 )
{
n->setLength( -DefaultTicksPerTact );
n->setVolume( 5 );
}
else if( _we->delta() > 0 )
{
n->setVolume( qMin( 100, vol + 5 ) );
}
else
{
n->setVolume( qMax( 0, vol - 5 ) );
}
if( len == 0 && _we->delta() > 0 )
{
n->setLength( -DefaultTicksPerTact );
n->setVolume( 5 );
}
else if( _we->delta() > 0 )
{
n->setVolume( qMin( 100, vol + 5 ) );
}
else
{
n->setVolume( qMax( 0, vol - 5 ) );
}
engine::getSong()->setModified();
update();
if( engine::pianoRoll()->currentPattern() == m_pat )
{
engine::pianoRoll()->update();
engine::getSong()->setModified();
update();
if( engine::pianoRoll()->currentPattern() == m_pat )
{
engine::pianoRoll()->update();
}
}
_we->accept();
}