Merge branch 'master' into ed_refac

This commit is contained in:
Lukas W committed 2015-01-08 10:49:09 +01:00
commit 7f2f9f2685
23 files changed
+120 -96

No files matched your search

+8 -3
View File
@@ -341,9 +341,14 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe )
QColor c;
if( !( m_tco->getTrack()->isMuted() || m_tco->isMuted() ) )
c = isSelected() ? QColor( 0, 0, 224 )
: styleColor;
else c = QColor( 80, 80, 80 );
c = styleColor;
else
c = QColor( 80, 80, 80 );
if( isSelected() == true )
{
c = QColor( qMax( c.red() - 128, 0 ), qMax( c.green() - 128, 0 ), 255 );
}
QLinearGradient grad( 0, 0, 0, height() );