Mercurial > hg > svgui

changeset 817:24f18a7dd26d tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch, and update to make sure we retain the DAW-style scrolling (page without moving playhead on scroll)
author Chris Cannam
date Wed, 02 Jul 2014 19:22:05 +0100
parents 7b6c5fce5f84
children fd95308b5d3f b2349053c5f8
files view/Overview.cpp
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
+        }            
     }
 }