Mercurial > hg > svgui
comparison view/Overview.cpp @ 818:fd95308b5d3f
Merge from tonioni branch
author | Chris Cannam |
---|---|
date | Wed, 02 Jul 2014 22:04:10 +0100 |
parents | 24f18a7dd26d |
children | 8bb9320f78a4 |
comparison
equal
deleted
inserted
replaced
815:09026c875301 | 818:fd95308b5d3f |
---|---|
286 std::min(m_centreFrame, newCentreFrame) > int(m_zoomLevel)) { | 286 std::min(m_centreFrame, newCentreFrame) > int(m_zoomLevel)) { |
287 int rf = alignToReference(newCentreFrame); | 287 int rf = alignToReference(newCentreFrame); |
288 #ifdef DEBUG_OVERVIEW | 288 #ifdef DEBUG_OVERVIEW |
289 cerr << "Overview::mouseMoveEvent: x " << e->x() << " and click x " << m_clickPos.x() << " -> frame " << newCentreFrame << " -> rf " << rf << endl; | 289 cerr << "Overview::mouseMoveEvent: x " << e->x() << " and click x " << m_clickPos.x() << " -> frame " << newCentreFrame << " -> rf " << rf << endl; |
290 #endif | 290 #endif |
291 emit centreFrameChanged(rf, true, PlaybackScrollContinuous); | 291 if (m_followPlay == PlaybackScrollContinuous || |
292 m_followPlay == PlaybackScrollPageWithCentre) { | |
293 emit centreFrameChanged(rf, true, PlaybackScrollContinuous); | |
294 } else { | |
295 emit centreFrameChanged(rf, true, PlaybackIgnore); | |
296 } | |
292 } | 297 } |
293 } | 298 } |
294 | 299 |
295 void | 300 void |
296 Overview::mouseDoubleClickEvent(QMouseEvent *e) | 301 Overview::mouseDoubleClickEvent(QMouseEvent *e) |