Mercurial > hg > svgui

diff view/View.cpp @ 236:90122740323f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fix alignment of new pane added after play position has changed (but global centre frame has not been explicitly moved)
author Chris Cannam
date Mon, 16 Apr 2007 15:16:10 +0000
parents efadb9d2b2c6
children 5105be027d8e
line wrap: on
line diff
--- a/view/View.cpp	Mon Apr 16 12:20:27 2007 +0000
+++ b/view/View.cpp	Mon Apr 16 15:16:10 2007 +0000
@@ -556,12 +556,6 @@
     }
 
     m_manager = manager;
-    if (m_followPlay != PlaybackIgnore) {
-        setCentreFrame(m_manager->getPlaybackFrame(), false);
-    } else if (m_followPan) {
-        setCentreFrame(m_manager->getGlobalCentreFrame(), false);
-    }
-    if (m_followZoom) setZoomLevel(m_manager->getGlobalZoom());
 
     connect(m_manager, SIGNAL(globalCentreFrameChanged(unsigned long)),
 	    this, SLOT(globalCentreFrameChanged(unsigned long)));
@@ -592,6 +586,15 @@
     connect(this, SIGNAL(zoomLevelChanged(unsigned long, bool)),
 	    m_manager, SLOT(viewZoomLevelChanged(unsigned long, bool)));
 
+    if (m_followPlay != PlaybackIgnore) {
+//        std::cerr << "View::setViewManager: setting centre frame to playback frame: " << m_manager->getPlaybackFrame() << std::endl;
+        setCentreFrame(m_manager->getPlaybackFrame(), false);
+    } else if (m_followPan) {
+//        std::cerr << "View::setViewManager: setting centre frame to global centre frame: " << m_manager->getGlobalCentreFrame() << std::endl;
+        setCentreFrame(m_manager->getGlobalCentreFrame(), false);
+    }
+    if (m_followZoom) setZoomLevel(m_manager->getGlobalZoom());
+
     toolModeChanged();
 }
 
@@ -1188,7 +1191,7 @@
 View::paintEvent(QPaintEvent *e)
 {
 //    Profiler prof("View::paintEvent", false);
-//    std::cerr << "View::paintEvent" << std::endl;
+//    std::cerr << "View::paintEvent: centre frame is " << m_centreFrame << std::endl;
 
     if (m_layers.empty()) {
 	QFrame::paintEvent(e);