comparison view/Pane.cpp @ 829:5acfb11e8aef

Do not move playhead on click, unless in "DAW mode". In centre-frame modes it's confusing and leads to random jumps when playing aligned material
author Chris Cannam
date Fri, 25 Jul 2014 17:02:16 +0100
parents 43256b925e15
children 7792b7667f74
comparison
equal deleted inserted replaced
828:1fdd895063c5 829:5acfb11e8aef
1331 float vmin, vmax, dmin, dmax; 1331 float vmin, vmax, dmin, dmax;
1332 if (getTopLayerDisplayExtents(vmin, vmax, dmin, dmax)) { 1332 if (getTopLayerDisplayExtents(vmin, vmax, dmin, dmax)) {
1333 m_dragStartMinValue = dmin; 1333 m_dragStartMinValue = dmin;
1334 } 1334 }
1335 1335
1336 // Schedule a play-head move to the mouse frame location. This 1336 if (m_followPlay == PlaybackScrollPage) {
1337 // will happen only if nothing else of interest happens 1337 // Schedule a play-head move to the mouse frame
1338 // (double-click, drag) before the timeout. 1338 // location. This will happen only if nothing else of
1339 schedulePlaybackFrameMove(getFrameForX(e->x())); 1339 // interest happens (double-click, drag) before the
1340 // timeout.
1341 schedulePlaybackFrameMove(getFrameForX(e->x()));
1342 }
1340 1343
1341 } else if (mode == ViewManager::SelectMode) { 1344 } else if (mode == ViewManager::SelectMode) {
1342 1345
1343 if (!hasTopLayerTimeXAxis()) return; 1346 if (!hasTopLayerTimeXAxis()) return;
1344 1347
1379 !m_ctrlPressed); 1382 !m_ctrlPressed);
1380 } 1383 }
1381 1384
1382 m_resizing = false; 1385 m_resizing = false;
1383 1386
1384 // Schedule a play-head move to the mouse frame 1387 if (m_followPlay == PlaybackScrollPage) {
1385 // location. This will happen only if nothing else of 1388 // Schedule a play-head move to the mouse frame
1386 // interest happens (double-click, drag) before the 1389 // location. This will happen only if nothing else of
1387 // timeout. 1390 // interest happens (double-click, drag) before the
1388 schedulePlaybackFrameMove(mouseFrame); 1391 // timeout.
1392 schedulePlaybackFrameMove(mouseFrame);
1393 }
1389 } 1394 }
1390 1395
1391 update(); 1396 update();
1392 1397
1393 } else if (mode == ViewManager::DrawMode) { 1398 } else if (mode == ViewManager::DrawMode) {