Mercurial > hg > svcore

changeset 107:f258fd1f74b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* win32 fixes * Attempt to make playback pointer movement smoother under load
author Chris Cannam
date Fri, 05 May 2006 16:38:18 +0000
parents 45175d8c5dc5
children 0c19e50bad7c
files base/View.cpp
diffstat 1 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/base/View.cpp	Fri May 05 14:04:43 2006 +0000
+++ b/base/View.cpp	Fri May 05 16:38:18 2006 +0000
@@ -738,20 +738,10 @@
     m_playPointerFrame = f;
     if (!visible) return;
 
-    bool modifierPressed = // we only care about these ones
-	((QApplication::keyboardModifiers() & Qt::ShiftModifier)
-#ifndef Q_WS_MAC
-         /* OS/X reports that CtrlModifier is pressed after we've
-            imported a file with Apple+I even though we then released it */
-         || (QApplication::keyboardModifiers() & Qt::ControlModifier)
-#endif
-            );
-
     switch (m_followPlay) {
 
     case PlaybackScrollContinuous:
-	if (QApplication::mouseButtons() == Qt::NoButton &&
-	    !modifierPressed) {
+	if (QApplication::mouseButtons() == Qt::NoButton) {
 	    setCentreFrame(f, false);
 	}
 	break;
@@ -759,7 +749,7 @@
     case PlaybackScrollPage:
     { 
 	int xold = getXForFrame(oldPlayPointerFrame);
-	repaint(xold - 1, 0, 3, height());
+	update(xold - 1, 0, 3, height());
 
 	long w = getEndFrame() - getStartFrame();
 	w -= w/5;
@@ -792,8 +782,7 @@
 #endif
 
 	if (xnew < width()/8 || xnew > (width()*7)/8) {
-	    if (QApplication::mouseButtons() == Qt::NoButton &&
-		!modifierPressed) {
+	    if (QApplication::mouseButtons() == Qt::NoButton) {
 		long offset = getFrameForX(width()/2) - getStartFrame();
 		long newCentre = sf + offset;
 		bool changed = setCentreFrame(newCentre, false);