changeset 588:e8881f405b8f

Full-screen fixes
author Chris Cannam
date Fri, 19 Jul 2013 15:45:40 +0100
parents 41684d0b0663
children 09c8195c371d
files .hgsubstate main/MainWindow.cpp
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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);
 }