From 8aa475962de4dc818499ce111b7309dd6fcb0866 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Tue, 27 Nov 2018 13:23:52 +0100
Subject: distancefieldgenerator: Preserve window size

Do not always start app as maximized; instead, save the state between
runs.

Change-Id: I30fb61e4b46a230ff1eb6fb93ef89df037a6afb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/distancefieldgenerator/main.cpp       | 2 +-
 src/distancefieldgenerator/mainwindow.cpp | 7 +++++++
 src/distancefieldgenerator/mainwindow.h   | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/distancefieldgenerator')

diff --git a/src/distancefieldgenerator/main.cpp b/src/distancefieldgenerator/main.cpp
index 6a39e8cc3..53ada87ac 100644
--- a/src/distancefieldgenerator/main.cpp
+++ b/src/distancefieldgenerator/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
     MainWindow mainWindow;
     if (!parser.positionalArguments().isEmpty())
         mainWindow.open(parser.positionalArguments().constFirst());
-    mainWindow.showMaximized();
+    mainWindow.show();
 
     return app.exec();
 }
diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp
index d41840484..d6e7adaf2 100644
--- a/src/distancefieldgenerator/mainwindow.cpp
+++ b/src/distancefieldgenerator/mainwindow.cpp
@@ -76,6 +76,8 @@ MainWindow::MainWindow(QWidget *parent)
     qRegisterMetaType<glyph_t>("glyph_t");
     qRegisterMetaType<QPainterPath>("QPainterPath");
 
+    restoreGeometry(m_settings.value(QStringLiteral("geometry")).toByteArray());
+
     setupConnections();
 }
 
@@ -100,6 +102,11 @@ void MainWindow::open(const QString &path)
     m_model->setFont(path);
 }
 
+void MainWindow::closeEvent(QCloseEvent * /*event*/)
+{
+    m_settings.setValue(QStringLiteral("geometry"), saveGeometry());
+}
+
 void MainWindow::setupConnections()
 {
     connect(ui->action_Open, &QAction::triggered, this, &MainWindow::openFont);
diff --git a/src/distancefieldgenerator/mainwindow.h b/src/distancefieldgenerator/mainwindow.h
index dfb346a95..89a83db52 100644
--- a/src/distancefieldgenerator/mainwindow.h
+++ b/src/distancefieldgenerator/mainwindow.h
@@ -51,6 +51,9 @@ public:
 
     void open(const QString &path);
 
+protected:
+    void closeEvent(QCloseEvent *event) override;
+
 private slots:
     void openFont();
     void startProgressBar(quint16 glyphCount);
-- 
cgit v1.2.1