# HG changeset patch
# User Chris Cannam
# Date 1404325325 -3600
# Node ID 24f18a7dd26d0cb175adfa807b606ace84795327
# Parent  7b6c5fce5f849472008c5a4a1faf824f7a9ddbdb
Merge from default branch, and update to make sure we retain the DAW-style scrolling (page without moving playhead on scroll)

diff -r 7b6c5fce5f84 -r 24f18a7dd26d view/Overview.cpp
--- a/view/Overview.cpp	Wed Jul 02 17:31:37 2014 +0100
+++ b/view/Overview.cpp	Wed Jul 02 19:22:05 2014 +0100
@@ -288,7 +288,12 @@
 #ifdef DEBUG_OVERVIEW
         cerr << "Overview::mouseMoveEvent: x " << e->x() << " and click x " << m_clickPos.x() << " -> frame " << newCentreFrame << " -> rf " << rf << endl;
 #endif
-	emit centreFrameChanged(rf, true, PlaybackScrollContinuous);
+        if (m_followPlay == PlaybackScrollContinuous ||
+            m_followPlay == PlaybackScrollPageWithCentre) {
+            emit centreFrameChanged(rf, true, PlaybackScrollContinuous);
+        } else {
+            emit centreFrameChanged(rf, true, PlaybackIgnore);
+        }            
     }
 }