Merge tag 'v2.1.4' into debian/sid

1 files changed, 21 insertions, 12 deletions

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 71fea63..71b9070 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -46,19 +46,7 @@ MainWindow::MainWindow(QWidget *parent) :
     _menu->setParent(this);
     setMenuBar(_menu);
 
-    QVariant geom = settings.value(QString("geometry-main-qt") + qVersion());
-    QVariant state = settings.value(QString("windowState-main-qt") + qVersion());
-
-    if (geom.isValid()) {
-        restoreGeometry(geom.toByteArray());
-    }
 
-    if (state.isValid()) {
-        restoreState(state.toByteArray(), 2);
-    } else {
-        addDockWidget(Qt::RightDockWidgetArea, _stylePalette);
-        resizeDocks({_stylePalette}, {130}, Qt::Horizontal);
-    }
 
     // initially, the source view should be collapsed
     QList<int> sz = ui->splitter->sizes();
@@ -76,6 +64,15 @@ MainWindow::MainWindow(QWidget *parent) :
 #else
     ui->tikzSource->setTabStopWidth(20);
 #endif
+
+
+    QVariant state = settings.value(QString("windowState-main-qt") + qVersion());
+    if (state.isValid()) {
+        restoreState(state.toByteArray(), 2);
+    } else {
+        addDockWidget(Qt::RightDockWidgetArea, _stylePalette);
+        resizeDocks({_stylePalette}, {130}, Qt::Horizontal);
+    }
 }
 
 MainWindow::~MainWindow()
@@ -84,6 +81,18 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::restorePosition()
+{
+    QSettings settings("tikzit", "tikzit");
+    QVariant geom = settings.value(QString("geometry-main-qt") + qVersion());
+
+    if (geom.isValid()) {
+        restoreGeometry(geom.toByteArray());
+    }
+
+
+}
+
 void MainWindow::open(QString fileName)
 {
     _tikzDocument->open(fileName);