Fix for bad window position when coming out of full screen

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index cfd3ab9b1a1c90120c9a653a6d5b2542d5e735b5..ec3961cf84dd5ac0f262a3be14561a309cb9880f 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -809,8 +809,18 @@ void MainWin::FrameAdvance(void)
 
 void MainWin::SetFullScreen(bool state/*= true*/)
 {
+#if 0
+       QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
+       QSize size = settings.value("size", QSize(400, 400)).toSize();
+       resize(size);
+       move(pos);
+       settings.setValue("pos", pos());
+       settings.setValue("size", size());
+#endif
        if (state)
        {
+               mainWinPosition = pos();
+//             mainWinSize = size();
                menuBar()->hide();
                statusBar()->hide();
                showFullScreen();
@@ -832,6 +842,7 @@ void MainWin::SetFullScreen(bool state/*= true*/)
                statusBar()->show();
                showNormal();
                ResizeMainWindow();
+               move(mainWinPosition);
        }
 
        // For some reason, this doesn't work: If the emu is paused, toggling from
@@ -882,11 +893,11 @@ void MainWin::ResizeMainWindow(void)
 void MainWin::ReadSettings(void)
 {
        QSettings settings("Underground Software", "Virtual Jaguar");
-       QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
+       mainWinPosition = settings.value("pos", QPoint(200, 200)).toPoint();
        QSize size = settings.value("size", QSize(400, 400)).toSize();
        resize(size);
-       move(pos);
-       pos = settings.value("cartLoadPos", QPoint(200, 200)).toPoint();
+       move(mainWinPosition);
+       QPoint pos = settings.value("cartLoadPos", QPoint(200, 200)).toPoint();
        filePickWin->move(pos);
 
        zoomLevel = settings.value("zoom", 2).toInt();