Merge pull request LMMS#1910 from Wallacoloo/master

Fix for LMMS#1907 - inconsistent clamping behavior in automation editor
Wallacoloo · Apr 1, 2015 · 77c6f5a · 77c6f5a
2 parents c1a2fde + 6e8e696
commit 77c6f5a
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
@@ -624,11 +624,6 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
 		float level = getLevel( mouseEvent->y() );
 		int x = mouseEvent->x();
 
-		if( mouseEvent->x() <= VALUES_WIDTH )
-		{
-			update();
-			return;
-		}
 		x -= VALUES_WIDTH;
 		if( m_action == MOVE_VALUE )
 		{
@@ -699,12 +694,12 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
 			{
 				if( QApplication::overrideCursor() )
 				{
-	if( QApplication::overrideCursor()->shape() != Qt::SizeAllCursor )
+					if( QApplication::overrideCursor()->shape() != Qt::SizeAllCursor )
 					{
-				while( QApplication::overrideCursor() != NULL )
-				{
-					QApplication::restoreOverrideCursor();
-				}
+						while( QApplication::overrideCursor() != NULL )
+						{
+							QApplication::restoreOverrideCursor();
+						}
 
 						QCursor c( Qt::SizeAllCursor );
 						QApplication::setOverrideCursor(