comparison view/Pane.cpp @ 1052:834e94eb1bca 3.0-integration

Merge from branch "alignment-simple"

 }
 
 void
 Pane::drawCentreLine(sv_samplerate_t sampleRate, QPainter &paint, bool omitLine)
 {
+    if (omitLine && m_manager->getMainModelSampleRate() == 0) {
+        return;
+    }
+    
     int fontHeight = paint.fontMetrics().height();
     int fontAscent = paint.fontMetrics().ascent();
 
     QColor c = QColor(0, 0, 0);
     if (!hasLightBackground()) {

          m_clickPos,
          e->pos(),
          true, // can move horiz
          canTopLayerMoveVertical(), // can move vert
          canTopLayerMoveVertical() || (m_manager && m_manager->isPlaying()), // resist horiz
-         !(m_manager && m_manager->isPlaying())); // resist vert
+         true); // resist vert
 
     if (m_dragMode == HorizontalDrag ||
         m_dragMode == FreeDrag) {
 
         sv_frame_t frameOff = getFrameForX(e->x()) - getFrameForX(m_clickPos.x());

         // the first wheel event -- discard those entirely
         if (abs(m_pendingWheelAngle) >= 600) {
             m_pendingWheelAngle = 0;
             return;
         }
-        
+
         while (abs(m_pendingWheelAngle) >= 120) {
 
             int sign = (m_pendingWheelAngle < 0 ? -1 : 1);
 
             if (horizontal) {