From 6e3d4f431dda9bbeddb7deb19849bfe0dc29bfe3 Mon Sep 17 00:00:00 2001
From: Amadeus Folego <amadeusfolego@gmail.com>
Date: Sun, 1 Mar 2015 22:22:17 -0300
Subject: [PATCH] Change behaviour for changing volume/pan on Piano

All the selected notes are changed by default for the 3 possible events:

- Mouse dragging the volume/pan meter
- Rolling the mouse wheel over the meter
- Double-clicking the meter

The user can still change each note individually by holding alt before
performing the desired action
---
 include/Note.h                |  1 +
 src/core/Note.cpp             |  5 +++
 src/gui/editors/PianoRoll.cpp | 70 ++++++++++++++---------------------
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/include/Note.h b/include/Note.h
index 05839a0063f..62a6f6f9308 100644
--- a/include/Note.h
+++ b/include/Note.h
@@ -204,6 +204,7 @@ class EXPORT Note : public SerializingObject
 		return m_detuning;
 	}
 	bool hasDetuningInfo() const;
+	bool withinRange(int tickStart, int tickEnd) const;
 
 	void createDetuning();
 
diff --git a/src/core/Note.cpp b/src/core/Note.cpp
index ed41abea870..f5851dde497 100644
--- a/src/core/Note.cpp
+++ b/src/core/Note.cpp
@@ -231,3 +231,8 @@ bool Note::hasDetuningInfo() const
 
 
 
+bool Note::withinRange(int tickStart, int tickEnd) const
+{
+	return pos().getTicks() >= tickStart && pos().getTicks() <= tickEnd
+		&& length().getTicks() != 0;
+}
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index c235fa8b4e5..76f918c83eb 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -1657,13 +1657,11 @@ void PianoRoll::mouseDoubleClickEvent(QMouseEvent * me )
 		notes += m_pattern->notes();
 
 		// go through notes to figure out which one we want to change
+		bool altPressed = me->modifiers() & Qt::AltModifier;
 		NoteVector nv;
 		foreach( Note * i, notes )
 		{
-			if( i->pos().getTicks() >= ticks_start
-				&& i->pos().getTicks() <= ticks_end
-				&& i->length().getTicks() != 0
-				&& ( i->selected() || ! isSelection() ) )
+			if( i->withinRange( ticks_start, ticks_end ) || ( i->selected() && !altPressed ) )
 			{
 				nv += i;
 			}
@@ -2077,27 +2075,22 @@ void PianoRoll::mouseMoveEvent( QMouseEvent * me )
 				}
 			}
 
-
-
-			// loop through vector
-			bool on_note = false;
-			bool use_selection = isSelection();
+			// When alt is pressed we only edit the note under the cursor
+			bool altPressed = me->modifiers() & Qt::AltModifier;
+			// We iterate from last note in pattern to the first,
+			// chronologically
 			NoteVector::ConstIterator it = notes.begin()+notes.size()-1;
 			for( int i = 0; i < notes.size(); ++i )
 			{
-				Note * n = *it;
-				if( n->pos().getTicks() >= ticks_start
-					&& n->pos().getTicks() <= ticks_end
-					&& n->length().getTicks() != 0
-					&& ( n->selected() || ! use_selection ) )
+				Note* n = *it;
+
+				bool isUnderPosition = n->withinRange( ticks_start, ticks_end );
+				// Play note under the cursor
+				if ( isUnderPosition ) { testPlayNote( n ); }
+				// If note is the one under the cursor or is selected when alt is
+				// not pressed
+				if ( isUnderPosition || ( n->selected() && !altPressed ) )
 				{
-					on_note = true;
-					m_pattern->dataChanged();
-
-					// play the note so that the user can tell how loud it is
-					// and where it is panned
-					testPlayNote( n );
-
 					if( m_noteEditMode == NoteEditVolume )
 					{
 						n->setVolume( vol );
@@ -2114,31 +2107,23 @@ void PianoRoll::mouseMoveEvent( QMouseEvent * me )
 						m_pattern->instrumentTrack()->processInEvent( evt );
 					}
 				}
-				else
+				else if( n->isPlaying() )
 				{
-					if( n->isPlaying() )
-					{
-						// mouse not over this note, stop playing it.
-						m_pattern->instrumentTrack()->pianoModel()->handleKeyRelease( n->key() );
+					// mouse not over this note, stop playing it.
+					m_pattern->instrumentTrack()->pianoModel()->handleKeyRelease( n->key() );
 
-						n->setIsPlaying( false );
-					}
+					n->setIsPlaying( false );
 				}
 
-				// set textfloat visible if we're on a note
-				if( on_note )
-				{
-					s_textFloat->moveGlobal( this,	QPoint( me->x() + 4, me->y() + 16 ) );
-					s_textFloat->show();
-				}
-				else
-				{
-					s_textFloat->hide();
-				}
 
 				--it;
-
 			}
+
+			// Emit pattern has changed
+			m_pattern->dataChanged();
+			// Show the new volume value
+			s_textFloat->moveGlobal( this, QPoint( me->x() + 4, me->y() + 16 ) );
+			s_textFloat->show();
 		}
 
 		else if( me->buttons() == Qt::NoButton && m_editMode == ModeDraw )
@@ -3165,14 +3150,13 @@ void PianoRoll::wheelEvent(QWheelEvent * we )
 		NoteVector notes;
 		notes += m_pattern->notes();
 
+		// When alt is pressed we only edit the note under the cursor
+		bool altPressed = we->modifiers() & Qt::AltModifier;
 		// go through notes to figure out which one we want to change
 		NoteVector nv;
 		foreach( Note * i, notes )
 		{
-			if( i->pos().getTicks() >= ticks_start
-				&& i->pos().getTicks() <= ticks_end
-				&& i->length().getTicks() != 0
-				&& ( i->selected() || ! isSelection() ) )
+			if( i->withinRange( ticks_start, ticks_end ) || ( i->selected() && !altPressed ) )
 			{
 				nv += i;
 			}