Merge pull request #532 from dresco/geometry-fix

Fix for 'stuck in full screen' issue
This commit is contained in:
Mark Liversedge
2013-03-28 14:43:41 -07:00

View File

@@ -221,7 +221,15 @@ MainWindow::MainWindow(const QDir &home) :
font.setPointSize(app.defaultFont);
QApplication::setFont(font);
} else setGeometry(geom.toRect());
} else {
QRect size = desktop->availableGeometry();
// ensure saved geometry isn't greater than current screen size
if ((geom.toRect().height() > size.height()) || (geom.toRect().width() > size.width()))
setGeometry(size);
else
setGeometry(geom.toRect());
}
#ifdef Q_OS_MAC // MAC NATIVE TOOLBAR