From 2c869c7a02391ebb6f48702f367f41b4acefc6ff Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Tue, 15 Apr 2025 12:09:13 +0100
Subject: [PATCH] Revert to old close behaviour

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/pagedialog/PageDialog.cpp | 19 +++++++------------
 launcher/ui/pagedialog/PageDialog.h   | 10 ++++------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/launcher/ui/pagedialog/PageDialog.cpp b/launcher/ui/pagedialog/PageDialog.cpp
index 3200a7c39..d01c2217b 100644
--- a/launcher/ui/pagedialog/PageDialog.cpp
+++ b/launcher/ui/pagedialog/PageDialog.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "PageDialog.h"
+#include <qevent.h>
 
 #include <QDialogButtonBox>
 #include <QKeyEvent>
@@ -53,22 +54,16 @@ PageDialog::PageDialog(BasePageProvider* pageProvider, QString defaultId, QWidge
     connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &PageDialog::reject);
     connect(buttons->button(QDialogButtonBox::Help), &QPushButton::clicked, m_container, &PageContainer::help);
 
-    connect(this, &QDialog::accepted, this, &PageDialog::onAccepted);
-    connect(this, &QDialog::rejected, this, &PageDialog::storeGeometry);
-
     restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("PagedGeometry").toByteArray()));
 }
-void PageDialog::onAccepted()
+
+void PageDialog::closeEvent([[maybe_unused]] QCloseEvent* event)
 {
-    qDebug() << "Paged dialog accepted";
+    qDebug() << "Paged dialog close requested";
     if (m_container->prepareToClose()) {
         qDebug() << "Paged dialog close approved";
-        emit applied();
+        APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
+        qDebug() << "Paged dialog geometry saved";
+        QDialog::closeEvent(event);
     }
 }
-
-void PageDialog::storeGeometry()
-{
-    APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
-    qDebug() << "Paged dialog geometry saved";
-}
diff --git a/launcher/ui/pagedialog/PageDialog.h b/launcher/ui/pagedialog/PageDialog.h
index d4af862f3..cc250af75 100644
--- a/launcher/ui/pagedialog/PageDialog.h
+++ b/launcher/ui/pagedialog/PageDialog.h
@@ -25,13 +25,11 @@ class PageDialog : public QDialog {
     explicit PageDialog(BasePageProvider* pageProvider, QString defaultId = QString(), QWidget* parent = 0);
     virtual ~PageDialog() {}
 
-    signals:
-     void applied();
+   signals:
+    void applied();
 
-
-   private slots:
-    void onAccepted();
-    void storeGeometry();
+   private:
+    void closeEvent(QCloseEvent* event) override;
 
    private:
     PageContainer* m_container;