From 90bcf0f47887215f8185501ca2175ddb39b4e40a Mon Sep 17 00:00:00 2001
From: Ripose <ripose@ptm>
Date: Sat, 17 Apr 2021 18:43:05 -0700
Subject: [PATCH] No longer holds previous window state in settings due to bugs

---
 src/gui/mainwindow.cpp | 23 ++---------------------
 src/gui/mainwindow.h   |  1 -
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 15ac0266..680de543 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -35,10 +35,6 @@
 #include <QSettings>
 #include <QStyleFactory>
 
-#define SETTINGS_WINDOW_GROUP               "window"
-#define SETTINGS_WINDOW_GEOMETRY            "geometry"
-#define SETTINGS_WINDOW_STATE               "state"
-
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent),
       m_mediator(GlobalMediator::createGlobalMedaitor()),
@@ -243,25 +239,8 @@ MainWindow::~MainWindow()
     delete m_ankiClient;
 }
 
-void MainWindow::closeEvent(QCloseEvent *event)
-{
-    QSettings settings;
-    settings.beginGroup(SETTINGS_WINDOW_GROUP);
-    settings.setValue(SETTINGS_WINDOW_GEOMETRY,  saveGeometry());
-    settings.setValue(SETTINGS_WINDOW_STATE,     saveState());
-    QMainWindow::closeEvent(event);
-}
-
 void MainWindow::showEvent(QShowEvent *event)
 {
-    /* Restore Window Settings */
-    QSettings settings;
-    settings.beginGroup(SETTINGS_WINDOW_GROUP);
-    restoreGeometry(settings.value(SETTINGS_WINDOW_GEOMETRY).toByteArray());
-    restoreState(settings.value(SETTINGS_WINDOW_STATE).toByteArray());
-    settings.endGroup();
-    m_maximized = isMaximized();
-
     /* Load files opened with Memento */
     QStringList args = QApplication::arguments();
     if (args.size() > 1)
@@ -284,6 +263,8 @@ void MainWindow::showEvent(QShowEvent *event)
             "To install a dictionary, go to Settings -> Options -> Dictionaries."
         );
     }
+
+    QMainWindow::showEvent(event);
 }
 
 void MainWindow::keyPressEvent(QKeyEvent *event)
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 0d1705ba..d2feafe0 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -85,7 +85,6 @@ private Q_SLOTS:
     void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
     void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
     void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
-    void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
 
 private:
     Ui::MainWindow   *m_ui;