Mercurial > hg > svcore

changeset 21:5da86cc182bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add natty segmentation display to time-value layer. Need to do the same for time-instants layer. * Make sure dense 3D model bin names are saved and restored properly. * Fix to chromagram normalization
author Chris Cannam
date Thu, 02 Feb 2006 17:31:08 +0000
parents 742e6882e187
children a1a6acb7cd37
files base/View.cpp
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/base/View.cpp	Thu Feb 02 16:10:19 2006 +0000
+++ b/base/View.cpp	Thu Feb 02 17:31:08 2006 +0000
@@ -516,17 +516,15 @@
     m_playPointerFrame = f;
     if (!visible) return;
 
-    if (QApplication::keyboardModifiers() != Qt::NoModifier) {
-	std::cerr << "View::viewManagerPlaybackFrameChanged: modifiers == "
-		  << QApplication::keyboardModifiers()
-		  << std::endl;
-    }
+    bool modifierPressed = // we only care about these ones
+	((QApplication::keyboardModifiers() & Qt::ShiftModifier) ||
+	 (QApplication::keyboardModifiers() & Qt::ControlModifier));
 
     switch (m_followPlay) {
 
     case PlaybackScrollContinuous:
 	if (QApplication::mouseButtons() == Qt::NoButton &&
-	    QApplication::keyboardModifiers() == Qt::NoModifier) {
+	    !modifierPressed) {
 	    setCentreFrame(f, false);
 	}
 	break;
@@ -568,7 +566,7 @@
 
 	if (xnew < width()/8 || xnew > (width()*7)/8) {
 	    if (QApplication::mouseButtons() == Qt::NoButton &&
-		QApplication::keyboardModifiers() == Qt::NoModifier) {
+		!modifierPressed) {
 		long offset = getFrameForX(width()/2) - getStartFrame();
 		long newCentre = sf + offset;
 		bool changed = setCentreFrame(newCentre, false);