comparison main/MainWindow.cpp @ 159:c07759e19346

* Fix Zoom to Fit and the scroll area (though I'd prefer scrollbar on the left)

     m_descriptionLabel = new QLabel;
 
     QScrollArea *scroll = new QScrollArea(frame);
     scroll->setWidgetResizable(true);
     scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-    QFrame *subframe = new QFrame;
-    scroll->setWidget(subframe);
-
-    m_paneStack = new PaneStack(subframe, m_viewManager);
+    scroll->setFrameShape(QFrame::NoFrame);
+
+//    QFrame *subframe = new QFrame;
+//    scroll->setWidget(subframe);
+
+//    QGridLayout *sublayout = new QGridLayout;
+//    subframe->setLayout(sublayout);
+
+//    m_paneStack = new PaneStack(subframe, m_viewManager);
+    m_paneStack = new PaneStack(scroll, m_viewManager);
     connect(m_paneStack, SIGNAL(currentPaneChanged(Pane *)),
 	    this, SLOT(currentPaneChanged(Pane *)));
     connect(m_paneStack, SIGNAL(currentLayerChanged(Pane *, Layer *)),
 	    this, SLOT(currentLayerChanged(Pane *, Layer *)));
     connect(m_paneStack, SIGNAL(rightButtonMenuRequested(Pane *, QPoint)),
             this, SLOT(rightButtonMenuRequested(Pane *, QPoint)));
     connect(m_paneStack, SIGNAL(propertyStacksResized()),
             this, SLOT(propertyStacksResized()));
     connect(m_paneStack, SIGNAL(contextHelpChanged(const QString &)),
             this, SLOT(contextHelpChanged(const QString &)));
+
+//    sublayout->addWidget(m_paneStack, 0, 0);
+    scroll->setWidget(m_paneStack);
 
     m_overview = new Overview(frame);
     m_overview->setViewManager(m_viewManager);
     m_overview->setFixedHeight(40);
 #ifndef _WIN32

     m_playSharpen->setChecked(settings.value("playsharpen", true).toBool());
     m_playMono->setChecked(settings.value("playmono", false).toBool());
     settings.endGroup();
 
     layout->setSpacing(4);
-    layout->addWidget(m_paneStack, 0, 0, 1, 5);
+    layout->addWidget(scroll, 0, 0, 1, 5);
     layout->addWidget(m_overview, 1, 0);
     layout->addWidget(m_fader, 1, 1);
     layout->addWidget(m_playSpeed, 1, 2);
     layout->addWidget(m_playSharpen, 1, 3);
     layout->addWidget(m_playMono, 1, 4);

     if (!model) return;
     
     size_t start = model->getStartFrame();
     size_t end = model->getEndFrame();
     size_t pixels = currentPane->width();
-    std::cerr << "pixels " << pixels << " -> ";
+
     size_t sw = currentPane->getVerticalScaleWidth();
     if (pixels > sw * 2) pixels -= sw * 2;
     else pixels = 1;
-    std::cerr << pixels << " (sw = " << sw << ")";
+    if (pixels > 4) pixels -= 4;
+
     size_t zoomLevel = (end - start) / pixels;
 
     currentPane->setZoomLevel(zoomLevel);
-    currentPane->setStartFrame(start);
+    currentPane->setCentreFrame((start + end) / 2);
 }
 
 void
 MainWindow::zoomDefault()
 {