From ad2c843e20dc66104a00322483a316d2c200a0e5 Mon Sep 17 00:00:00 2001
From: Karmo Rosental <karmo.rosental@gmail.com>
Date: Sat, 10 Jun 2017 22:55:00 +0300
Subject: [PATCH] Fixed inverted zooming. (#3570)

* Fixed inverted zooming.

* Prevent useless tests.
---
 src/gui/editors/AutomationEditor.cpp | 28 ++++++++++++++--------------
 src/gui/editors/PianoRoll.cpp        | 14 +++++++-------
 src/gui/editors/SongEditor.cpp       | 10 +++++-----
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
index 7f2e549a3..29958d886 100644
--- a/src/gui/editors/AutomationEditor.cpp
+++ b/src/gui/editors/AutomationEditor.cpp
@@ -69,7 +69,7 @@ QPixmap * AutomationEditor::s_toolYFlip = NULL;
 QPixmap * AutomationEditor::s_toolXFlip = NULL;
 
 const QVector<double> AutomationEditor::m_zoomXLevels =
-		{ 8.0f, 4.0f, 2.0f, 1.0f, 0.5f, 0.25f, 0.125f };
+		{ 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f };
 
 
 
@@ -1303,7 +1303,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
 		//Don't bother doing/rendering anything if there is no automation points
 		if( time_map.size() > 0 )
 		{
-			timeMap::iterator it = time_map.begin(); 
+			timeMap::iterator it = time_map.begin();
 			while( it+1 != time_map.end() )
 			{
 				// skip this section if it occurs completely before the
@@ -1320,7 +1320,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
 				{
 					break;
 				}
-				
+
 				//NEEDS Change in CSS
 				/*bool is_selected = false;
 				// if we're in move-mode, we may only draw
@@ -1360,8 +1360,8 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
 				for( int i = 0; i < ( it + 1 ).key() - it.key(); i++ )
 				{	path.lineTo( QPointF( xCoordOfTick( it.key() + i ), yCoordOfLevel( values[i] ) ) );
 					//NEEDS Change in CSS
-					//drawLevelTick( p, it.key() + i, values[i], is_selected ); 
-					
+					//drawLevelTick( p, it.key() + i, values[i], is_selected );
+
 				}
 				path.lineTo( QPointF( xCoordOfTick( ( it + 1 ).key() ), yCoordOfLevel( nextValue ) ) );
 				path.lineTo( QPointF( xCoordOfTick( ( it + 1 ).key() ), yCoordOfLevel( 0 ) ) );
@@ -1537,12 +1537,12 @@ void AutomationEditor::drawLevelTick(QPainter & p, int tick, float value)
 
 		p.fillRect( x, y_start, rect_width, rect_height, currentColor );
 	}
-	
+
 	else
 	{
 		printf("not in range\n");
 	}
-	
+
 }
 
 
@@ -1600,12 +1600,12 @@ void AutomationEditor::wheelEvent(QWheelEvent * we )
 		{
 			y++;
 		}
-		if( we->delta() < 0 )
+		else if( we->delta() < 0 )
 		{
 			y--;
 		}
 		y = qBound( 0, y, m_zoomingYModel.size() - 1 );
-		m_zoomingYModel.setValue( y ); 
+		m_zoomingYModel.setValue( y );
 	}
 	else if( we->modifiers() & Qt::ControlModifier && we->modifiers() & Qt::AltModifier )
 	{
@@ -1614,7 +1614,7 @@ void AutomationEditor::wheelEvent(QWheelEvent * we )
 		{
 			q--;
 		}
-		if( we->delta() < 0 )
+		else if( we->delta() < 0 )
 		{
 			q++;
 		}
@@ -1626,13 +1626,13 @@ void AutomationEditor::wheelEvent(QWheelEvent * we )
 	{
 		int x = m_zoomingXModel.value();
 		if( we->delta() > 0 )
-		{
-			x--;
-		}
-		if( we->delta() < 0 )
 		{
 			x++;
 		}
+		else if( we->delta() < 0 )
+		{
+			x--;
+		}
 		x = qBound( 0, x, m_zoomingXModel.size() - 1 );
 		m_zoomingXModel.setValue( x );
 	}
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index f09907fcb..080369d8c 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -143,7 +143,7 @@ PianoRoll::PianoRollKeyTypes PianoRoll::prKeyOrder[] =
 const int DEFAULT_PR_PPT = KEY_LINE_HEIGHT * DefaultStepsPerTact;
 
 const QVector<double> PianoRoll::m_zoomLevels =
-			{ 8.0f, 4.0f, 2.0f, 1.0f, 0.5f, 0.25f, 0.125f };
+		{ 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f };
 
 
 PianoRoll::PianoRoll() :
@@ -3256,7 +3256,7 @@ void PianoRoll::wheelEvent(QWheelEvent * we )
 		{
 			q--;
 		}
-		if( we->delta() < 0 )
+		else if( we->delta() < 0 )
 		{
 			q++;
 		}
@@ -3270,7 +3270,7 @@ void PianoRoll::wheelEvent(QWheelEvent * we )
 		{
 			l--;
 		}
-		if( we->delta() < 0 )
+		else if( we->delta() < 0 )
 		{
 			l++;
 		}
@@ -3281,13 +3281,13 @@ void PianoRoll::wheelEvent(QWheelEvent * we )
 	{
 		int z = m_zoomingModel.value();
 		if( we->delta() > 0 )
-		{
-			z--;
-		}
-		if( we->delta() < 0 )
 		{
 			z++;
 		}
+		else if( we->delta() < 0 )
+		{
+			z--;
+		}
 		z = qBound( 0, z, m_zoomingModel.size() - 1 );
 		// update combobox with zooming-factor
 		m_zoomingModel.setValue( z );
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index d110201c8..ed0491e20 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -71,7 +71,7 @@ void positionLine::paintEvent( QPaintEvent * pe )
 }
 
 const QVector<double> SongEditor::m_zoomLevels =
-		{ 16.0f, 8.0f, 4.0f, 2.0f, 1.0f, 0.5f, 0.25f, 0.125f };
+		{ 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f, 16.0f };
 
 
 SongEditor::SongEditor( Song * song ) :
@@ -360,13 +360,13 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 		int z = m_zoomingModel->value();
 
 		if( we->delta() > 0 )
-		{
-			z--;
-		}
-		if( we->delta() < 0 )
 		{
 			z++;
 		}
+		else if( we->delta() < 0 )
+		{
+			z--;
+		}
 		z = qBound( 0, z, m_zoomingModel->size() - 1 );
 		// update combobox with zooming-factor
 		m_zoomingModel->setValue( z );