fixed bug I introduced a few revisions ago - accidentally checked for the opposite of the intended modifier

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1943 0778d3d1-df1d-0410-868b-ea421aaaa00d

TODO

@@ -62,6 +62,8 @@ Andrew Kelley's todo:
   * look through FL Studio's tools and implement some of them
 - slice tool for piano roll
 - when a note is played, show the note as being depressed in the piano roll
+- don't end mouse selection when control is released
+- mouse cursor isn't updated correctly in selection mode (from resizing note edit area)
 
 - recording automation
 - make knobs easier to tune (less sensitive)

src/core/track.cpp

@@ -663,7 +663,7 @@ void trackContentObjectView::mouseMoveEvent( QMouseEvent * _me )
 			m_trackView->getTrackContainerView()->currentPosition()+
 				static_cast<int>( x * midiTime::ticksPerTact() /
 									ppt ) );
-		if( _me->modifiers() & Qt::ControlModifier
+		if( ! ( _me->modifiers() & Qt::ControlModifier )
 		   && _me->button() == Qt::NoButton )
 		{
 			t = t.toNearestTact();
@@ -716,7 +716,7 @@ void trackContentObjectView::mouseMoveEvent( QMouseEvent * _me )
 		midiTime t = qMax( midiTime::ticksPerTact(),
 				static_cast<int>( _me->x() *
 					midiTime::ticksPerTact() / ppt ) );
-		if( _me->modifiers() & Qt::ControlModifier 
+		if( ! ( _me->modifiers() & Qt::ControlModifier )
 		   && _me->button() == Qt::NoButton )
 		{
 			t = t.toNearestTact();

src/gui/widgets/automatable_button.cpp

@@ -115,7 +115,7 @@ void automatableButton::contextMenuEvent( QContextMenuEvent * _me )
 void automatableButton::mousePressEvent( QMouseEvent * _me )
 {
 	if( _me->button() == Qt::LeftButton &&
-			_me->modifiers() & Qt::ControlModifier )
+			! ( _me->modifiers() & Qt::ControlModifier ) )
 	{
 		if( isCheckable() )
 		{

src/gui/widgets/automatable_slider.cpp

@@ -76,7 +76,7 @@ void automatableSlider::contextMenuEvent( QContextMenuEvent * _me )
 void automatableSlider::mousePressEvent( QMouseEvent * _me )
 {
 	if( _me->button() == Qt::LeftButton &&
-	   _me->modifiers() & Qt::ControlModifier )
+	   ! ( _me->modifiers() & Qt::ControlModifier ) )
 	{
 		m_showStatus = TRUE;
 		QSlider::mousePressEvent( _me );

src/gui/widgets/combobox.cpp

@@ -114,7 +114,7 @@ void comboBox::contextMenuEvent( QContextMenuEvent * _me )
 void comboBox::mousePressEvent( QMouseEvent * _me )
 {
 	if( _me->button() == Qt::LeftButton &&
-			_me->modifiers() & Qt::ControlModifier )
+			! ( _me->modifiers() & Qt::ControlModifier ) )
 	{
 		if( _me->x() > width() - CB_ARROW_BTN_WIDTH )
 		{

src/gui/widgets/fader.cpp

@@ -112,7 +112,7 @@ void fader::mouseMoveEvent( QMouseEvent *ev )
 void fader::mousePressEvent( QMouseEvent * _me )
 {
 	if( _me->button() == Qt::LeftButton &&
-			_me->modifiers() & Qt::ControlModifier )
+			! ( _me->modifiers() & Qt::ControlModifier ) )
 	{
 		mouseMoveEvent( _me );
 		_me->accept();

src/gui/widgets/knob.cpp

@@ -439,8 +439,8 @@ void knob::dropEvent( QDropEvent * _de )
 void knob::mousePressEvent( QMouseEvent * _me )
 {
 	if( _me->button() == Qt::LeftButton &&
-			_me->modifiers() & Qt::ControlModifier &&
-			_me->modifiers() & Qt::ShiftModifier )
+			! ( _me->modifiers() & Qt::ControlModifier ) &&
+			! ( _me->modifiers() & Qt::ShiftModifier ) )
 	{
 		model()->prepareJournalEntryFromOldVal();
 

src/gui/widgets/lcd_spinbox.cpp

@@ -285,7 +285,7 @@ void lcdSpinBox::contextMenuEvent( QContextMenuEvent * _me )
 void lcdSpinBox::mousePressEvent( QMouseEvent * _me )
 {
 	if( _me->button() == Qt::LeftButton &&
-		_me->modifiers() & Qt::ControlModifier &&
+		! ( _me->modifiers() & Qt::ControlModifier ) &&
 						_me->y() < m_cellHeight + 2  )
 	{
 		m_origMousePos = _me->globalPos();