comparison widgets/Pane.cpp @ 20:1deb5f87a18c

* Add getXForFrame / getFrameForX in preference to using the zoom level everywhere

 {
     closeToLeftEdge = closeToRightEdge = false;
 
     if (!m_manager) return Selection();
 
-    long testFrame = (x - 5) * m_zoomLevel + getStartFrame();
+    long testFrame = getFrameForX(x - 5);
     if (testFrame < 0) {
-	testFrame = x * m_zoomLevel + getStartFrame();
+	testFrame = getFrameForX(x);
 	if (testFrame < 0) return Selection();
     }
 
     Selection selection = m_manager->getContainingSelection(testFrame, true);
     if (selection.isEmpty()) return selection;
 
-    int lx = (int(selection.getStartFrame()) - getStartFrame()) / m_zoomLevel;
-    int rx = (int(selection.getEndFrame()) - getStartFrame()) / m_zoomLevel;
+    int lx = getXForFrame(selection.getStartFrame());
+    int rx = getXForFrame(selection.getEndFrame());
     
     int fuzz = 2;
     if (x < lx - fuzz || x > rx + fuzz) return Selection();
 
     int width = rx - lx;

 	    m_manager->setInProgressSelection(selection, false);
 	    m_resizing = true;
 	
 	} else {
 
-	    int mouseFrame = e->x() * m_zoomLevel + getStartFrame();
+	    int mouseFrame = getFrameForX(e->x());
 	    size_t resolution = 1;
 	    int snapFrame = mouseFrame;
 	
 	    Layer *layer = getSelectedLayer();
 	    if (layer) {

 
 	    int x0 = std::min(m_clickPos.x(), m_mousePos.x());
 	    int x1 = std::max(m_clickPos.x(), m_mousePos.x());
 	    int w = x1 - x0;
 	    
-	    long newStartFrame = getStartFrame() + m_zoomLevel * x0;
-	    
-	    if (newStartFrame <= -long(width() * m_zoomLevel)) {
-		newStartFrame  = -long(width() * m_zoomLevel) + 1;
+	    long newStartFrame = getFrameForX(x0);
+	    
+	    long visibleFrames = getEndFrame() - getStartFrame();
+	    if (newStartFrame <= -visibleFrames) {
+		newStartFrame  = -visibleFrames + 1;
 	    }
 	    
 	    if (newStartFrame >= long(getModelsEndFrame())) {
 		newStartFrame  = getModelsEndFrame() - 1;
 	    }

 	    m_mousePos = e->pos();
 	    update();
 
 	} else {
 
-	    long xoff = int(e->x()) - int(m_clickPos.x());
-	    long frameOff = xoff * m_zoomLevel;
-	    
+	    long frameOff = getFrameForX(e->x()) - getFrameForX(m_clickPos.x());
+
 	    size_t newCentreFrame = m_dragCentreFrame;
 	    
 	    if (frameOff < 0) {
 		newCentreFrame -= frameOff;
 	    } else if (newCentreFrame >= size_t(frameOff)) {

 	    
 	    if (newCentreFrame >= getModelsEndFrame()) {
 		newCentreFrame = getModelsEndFrame();
 		if (newCentreFrame > 0) --newCentreFrame;
 	    }
-	    
-	    if (std::max(m_centreFrame, newCentreFrame) -
-		std::min(m_centreFrame, newCentreFrame) > size_t(m_zoomLevel)) {
+
+	    if (getXForFrame(m_centreFrame) != getXForFrame(newCentreFrame)) {
 		setCentreFrame(newCentreFrame);
 	    }
 	}
 
     } else if (mode == ViewManager::SelectMode) {
 
-	int mouseFrame = e->x() * m_zoomLevel + getStartFrame();
+	int mouseFrame = getFrameForX(e->x());
 	size_t resolution = 1;
 	int snapFrameLeft = mouseFrame;
 	int snapFrameRight = mouseFrame;
 	
 	Layer *layer = getSelectedLayer();

 	else count = -1;
     }
 
     if (e->modifiers() & Qt::ControlModifier) {
 
+	// Scroll left or right, rapidly
+
 	if (getStartFrame() < 0 && 
 	    getEndFrame() >= getModelsEndFrame()) return;
 
 	long delta = ((width() / 2) * count * m_zoomLevel);
 

 	    setCentreFrame(m_centreFrame - delta);
 	}
 
     } else {
 
+	// Zoom in or out
+
 	int newZoomLevel = m_zoomLevel;
   
 	while (count > 0) {
 	    if (newZoomLevel <= 2) {
 		newZoomLevel = 1;