Mercurial > hg > svgui

changeset 818:fd95308b5d3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from tonioni branch
author Chris Cannam
date Wed, 02 Jul 2014 22:04:10 +0100
parents 09026c875301 (current diff) 24f18a7dd26d (diff)
children 2d4af227fd32
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/view/Overview.cpp	Wed Jul 02 17:30:09 2014 +0100
+++ b/view/Overview.cpp	Wed Jul 02 22:04:10 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);
+        }            
     }
 }