From 33a14547453c9b0c624337f32b5e423b5351221e Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 23 Oct 2014 12:47:16 +0300 Subject: [PATCH] Save and restore last window position and size. --HG-- branch : develop --- src/app/main.cpp | 1 - src/app/mainwindow.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 2661719d3..19d9caa18 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -175,7 +175,6 @@ int main(int argc, char *argv[]) } MainWindow w; - w.setWindowState(w.windowState() ^ Qt::WindowMaximized); app.setWindowIcon(QIcon(":/icon/64x64/icon64x64.png")); app.setMainWindow(&w); TableWindow table; diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 9b1e984df..c0328463d 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -57,6 +57,7 @@ #include #include #include +#include //--------------------------------------------------------------------------------------------------------------------- /** @@ -1920,8 +1921,9 @@ QString MainWindow::strippedName(const QString &fullFileName) */ void MainWindow::ReadSettings() { - QPoint pos = qApp->getSettings()->value("pos", QPoint(10, 10)).toPoint(); - QSize size = qApp->getSettings()->value("size", QSize(1000, 800)).toSize(); + QRect geomentry = VApplication::desktop()->availableGeometry(this); + QPoint pos = qApp->getSettings()->value("pos", geomentry.topLeft()).toPoint(); + QSize size = qApp->getSettings()->value("size", geomentry.size()).toSize(); resize(size); move(pos);