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

Merge pull request #1710 from curlymorphic/i1595

Browse Source 
Proposed fix for #1595 Instrument track activity LED lights when muted.
This commit is contained in:
Tres Finocchiaro
2015-01-29 13:54:53 -05:00
parent 525e627fa4 5ce1bd874d
commit 0f43b0a472
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/widgets/FadeButton.cpp
View File

@@ -55,6 +55,11 @@ FadeButton::~FadeButton()
{
}
void FadeButton::setActiveColor( const QColor & activated_color )
{
m_activatedColor = activated_color;
}

17
src/tracks/InstrumentTrack.cpp
View File

@@ -926,6 +926,7 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
connect( m_activityIndicator, SIGNAL( released() ),
this, SLOT( activityIndicatorReleased() ) );
_it->setIndicator( m_activityIndicator );
connect( &_it->m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteChanged() ) );
setModel( _it );
}
@@ -1130,6 +1131,22 @@ void InstrumentTrackView::midiConfigChanged()
void InstrumentTrackView::muteChanged()
{
if(model()->m_mutedModel.value() )
{
m_activityIndicator->setActiveColor( QApplication::palette().color( QPalette::Active,
QPalette::Highlight ) );
} else
{
m_activityIndicator->setActiveColor( QApplication::palette().color( QPalette::Active,
QPalette::BrightText ) );
}
}
class fxLineLcdSpinBox : public LcdSpinBox