# HG changeset patch # User Chris Cannam # Date 1374245140 -3600 # Node ID e8881f405b8f7cba9d7f6f4d177ee09d21345b7b # Parent 41684d0b06639f89fe4a400c80cae9992b038d70 Full-screen fixes diff -r 41684d0b0663 -r e8881f405b8f .hgsubstate --- a/.hgsubstate Fri Jul 19 15:15:17 2013 +0100 +++ b/.hgsubstate Fri Jul 19 15:45:40 2013 +0100 @@ -1,4 +1,4 @@ 7096c7de2d4c327de5e028c33036f146a1884706 dataquay 868db2bf6a694ab766cbf73b6b9c2a84907387d5 svapp 420ade1cb6da314a5717637d902238b713ebc4b0 svcore -d52751e2728b3e714b31d7ff17d95035d1e4b706 svgui +0aea4b9e4c3dca9c42f9181748bdfde924a8574f svgui diff -r 41684d0b0663 -r e8881f405b8f main/MainWindow.cpp --- a/main/MainWindow.cpp Fri Jul 19 15:15:17 2013 +0100 +++ b/main/MainWindow.cpp Fri Jul 19 15:45:40 2013 +0100 @@ -375,6 +375,11 @@ void MainWindow::goFullScreen() { + if (m_viewManager->getZoomWheelsEnabled()) { + // The wheels seem to end up in the wrong place in full-screen mode + toggleZoomWheels(); + } + QWidget *ps = m_mainScroll->takeWidget(); ps->setParent(0); @@ -409,6 +414,7 @@ if (sc) delete sc; } + m_paneStack->showNormal(); m_mainScroll->setWidget(m_paneStack); }