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

Merge pull request #417 from diizy/stable-0.4

Browse Source 
Pattern: fix bb-track mousewheeling (bit of an oversight on my part, for...
This commit is contained in:
Tobias Doerffel
2014-03-06 09:04:05 +01:00
parent 192484fa28 e40c70ff8c
commit 0b387b0f72
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/tracks/pattern.cpp
View File

@@ -536,6 +536,11 @@ void pattern::updateBBTrack()
{
engine::getBBTrackContainer()->updateBBTrack( this );
}
if( engine::getPianoRoll()->currentPattern() == this )
{
engine::getPianoRoll()->update();
}
}
@@ -827,42 +832,42 @@ void patternView::wheelEvent( QWheelEvent * _we )
m_pat->m_steps != MidiTime::stepsPerTact() ) &&
_we->y() > height() - s_stepBtnOff->height() )
{
int step = ( _we->x() - TCO_BORDER_WIDTH ) *
m_pat->length() / DefaultBeatsPerTact / width();
// get the step number that was wheeled on and
// do calculations in floats to prevent rounding errors...
float tmp = ( ( float(_we->x()) - TCO_BORDER_WIDTH ) *
float( m_pat -> m_steps ) ) / float(width() - TCO_BORDER_WIDTH*2);
int step = int( tmp );
if( step >= m_pat->m_steps )
{
return;
}
note * n = m_pat->m_notes[step];
int vol = n->getVolume();
if( n->length() == 0 && _we->delta() > 0 )
int vol = 0;
int len = 0;
note * n = m_pat->noteAtStep( step );
if( n != NULL )
{
vol = n->getVolume();
len = n->length();
}
if( len == 0 && _we->delta() > 0 )
{
n->setLength( -DefaultTicksPerTact );
n->setVolume( 5 );
}
else if( _we->delta() > 0 )
{
if( vol < 95 )
{
n->setVolume( vol + 5 );
}
else
{
n->setVolume( 100 );
}
n->setVolume( qMin( 100, vol + 5 ) );
}
else
{
if( vol > 5 )
{
n->setVolume( vol - 5 );
}
else
{
n->setLength( 0 );
}
n->setVolume( qMax( 0, vol - 5 ) );
}
engine::getSong()->setModified();
update();
if( engine::getPianoRoll()->currentPattern() == m_pat )