FadeButtons now remain partially lit as a note plays out

include/FadeButton.h

@@ -35,15 +35,18 @@ class FadeButton : public QAbstractButton
 {
 	Q_OBJECT
 public:
-	FadeButton( const QColor & _normal_color, const QColor &
-					_activated_color, QWidget * _parent );
+	FadeButton( const QColor & _normal_color,
+		const QColor & _activated_color,
+		const QColor & _hold_color,
+		QWidget * _parent );
 
 	virtual ~FadeButton();
 	void setActiveColor( const QColor & activated_color );
 
 
 public slots:
 	void activate();
+	void noteEnd();
 
 
 protected:
@@ -52,14 +55,16 @@ public slots:
 
 
 private:
-	QTime m_stateTimer;
+	QTime m_activateStateTimer;
+
 	QColor m_normalColor;
 	QColor m_activatedColor;
+	QColor m_holdColor;
+	int activeNotes;
 
 	void signalUpdate();
 
 } ;
 
 
 #endif
-

include/InstrumentTrack.h

@@ -221,6 +221,7 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 	void midiNoteOff( const Note& );
 	void nameChanged();
 	void newNote();
+	void endNote();
 
 
 protected:

src/gui/widgets/FadeButton.cpp

@@ -2,7 +2,7 @@
  * FadeButton.cpp - implementation of fade-button
  *
  * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - https://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301 USA.
  *
  */
- 
+
 
 #include <QTimer>
 #include <QApplication>
@@ -36,15 +36,19 @@ const float FadeDuration = 300;
 
 
 FadeButton::FadeButton( const QColor & _normal_color,
-			const QColor & _activated_color, QWidget * _parent ) :
+			const QColor & _activated_color,
+                        const QColor & _hold_color,
+                        QWidget * _parent ) :
 	QAbstractButton( _parent ),
-	m_stateTimer(),
+	m_activateStateTimer(),
 	m_normalColor( _normal_color ),
-	m_activatedColor( _activated_color )
+	m_activatedColor( _activated_color ),
+        m_holdColor( _hold_color )
 {
 	setAttribute( Qt::WA_OpaquePaintEvent, true );
 	setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
 	setFocusPolicy( Qt::NoFocus );
+        activeNotes = 0;
 }
 
 
@@ -64,13 +68,32 @@ void FadeButton::setActiveColor( const QColor & activated_color )
 
 void FadeButton::activate()
 {
-	m_stateTimer.restart();
+	m_activateStateTimer.restart();
+        activeNotes++;
 	signalUpdate();
 }
 
 
 
 
+void FadeButton::noteEnd()
+{
+        if(activeNotes <= 0)
+        {
+                qWarning("noteEnd() triggered without a corresponding activate()!");
+                activeNotes = 0;
+        }
+        else
+        {
+                activeNotes--;
+        }
+
+        signalUpdate();
+}
+
+
+
+
 void FadeButton::customEvent( QEvent * )
 {
 	update();
@@ -82,21 +105,35 @@ void FadeButton::customEvent( QEvent * )
 void FadeButton::paintEvent( QPaintEvent * _pe )
 {
 	QColor col = m_normalColor;
-	if( ! m_stateTimer.isNull() && m_stateTimer.elapsed() < FadeDuration )
+
+	if( ! m_activateStateTimer.isNull() && m_activateStateTimer.elapsed() < FadeDuration )
 	{
-		const float state = 1 - m_stateTimer.elapsed() / FadeDuration;
-		const int r = (int)( m_normalColor.red() *
+                // The first part of the fade, when a note is triggered.
+		const float state = 1 - m_activateStateTimer.elapsed() / FadeDuration;
+		const int r = (int)( m_holdColor.red() *
 					( 1.0f - state ) +
 			m_activatedColor.red() * state );
-		const int g = (int)( m_normalColor.green() *
+		const int g = (int)( m_holdColor.green() *
 					( 1.0f - state ) +
 			m_activatedColor.green() * state );
-		const int b = (int)( m_normalColor.blue() *
+		const int b = (int)( m_holdColor.blue() *
 					( 1.0f - state ) +
 			m_activatedColor.blue() * state );
 		col.setRgb( r, g, b );
 		QTimer::singleShot( 20, this, SLOT( update() ) );
 	}
+        else if( ! m_activateStateTimer.isNull()
+                && m_activateStateTimer.elapsed() >= FadeDuration
+                && activeNotes > 0)
+        {
+                // The fade is done, but at least one note is still held.
+                col = m_holdColor;
+        }
+        else
+        {
+                // No fade, no notes. Reset to default color.
+                col = m_normalColor;
+        }
 
 	QPainter p( this );
 	p.fillRect( rect(), col );
@@ -118,10 +155,3 @@ void FadeButton::signalUpdate()
 {
 	QApplication::postEvent( this, new updateEvent() );
 }
-
-
-
-
-
-
-

src/tracks/InstrumentTrack.cpp

@@ -422,6 +422,7 @@ void InstrumentTrack::processOutEvent( const MidiEvent& event, const MidiTime& t
 				m_instrument->handleMidiEvent( MidiEvent( MidiNoteOff, midiPort()->realOutputChannel(), key, 0 ), time, offset );
 			}
 			m_midiNotesMutex.unlock();
+			emit endNote();
 			break;
 
 		default:
@@ -969,6 +970,8 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 							QPalette::Background),
 						QApplication::palette().color( QPalette::Active,
 							QPalette::BrightText ),
+						QApplication::palette().color( QPalette::Active,
+							QPalette::BrightText).darker(),
 						getTrackSettingsWidget() );
 	m_activityIndicator->setGeometry(
 					 widgetWidth-2*24-11, 2, 8, 28 );
@@ -979,6 +982,8 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 				this, SLOT( activityIndicatorReleased() ) );
 	connect( _it, SIGNAL( newNote() ),
 			 m_activityIndicator, SLOT( activate() ) );
+	connect( _it, SIGNAL( endNote() ),
+	 		m_activityIndicator, SLOT( noteEnd() ) );
 	connect( &_it->m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteChanged() ) );
 
 	setModel( _it );