Windows are now properly closed and destroyed

Previously windows could remain in a half-closed state where their content had been removed and deleted but the operating system’s window manager still displayed an empty window frame.

gui/mainwindow.cpp

@@ -163,6 +163,7 @@ MainWindow::MainWindow(TexGenApplication* parent)
 
    setWindowTitle("ProceduralTextureMaker");
    statusBar()->hide();
+   setAttribute(Qt::WA_DeleteOnClose);
 
    if (QSettings().value("showhelpstartup", true).toBool()) {
       showHelp();
@@ -182,8 +183,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
       return;
    }
    event->accept();
-   parentapp->removeWindow(this);
-   delete this;
 }
 
 /**

gui/mainwindow.h

@@ -40,8 +40,6 @@ class MainWindow : public QMainWindow
 public:
    MainWindow(TexGenApplication* parent = 0);
    virtual ~MainWindow();
-
-public:
    TextureProject* getTextureProject() { return project; }
    TexGenApplication* parent() { return parentapp; }
    MenuActions* getMenu() { return menuactions; }
@@ -53,7 +51,7 @@ public slots:
    void clearScene();
    void showAbout();
    void showHelp();
-   void closeEvent(QCloseEvent*);
+   virtual void closeEvent(QCloseEvent*);
    void copyNode();
    void pasteNode();
    void cutNode();

gui/menuactions.cpp

@@ -52,11 +52,17 @@ MenuActions::MenuActions(MainWindow* parent)
    QObject::connect(saveImageAct, &QAction::triggered,
                     parent, &MainWindow::saveImage);
 
-   exitAct = new QAction("E&xit", parent);
+   closeAct = new QAction("Close window", parent);
+   closeAct->setShortcut(QKeySequence::Close);
+   closeAct->setStatusTip("Close the window");
+   QObject::connect(closeAct, &QAction::triggered,
+                    parent, &MainWindow::close);
+
+
+   exitAct = new QAction("Q&uit application", parent);
    exitAct->setShortcut(QKeySequence::Quit);
-   exitAct->setStatusTip("Exit the application");
    QObject::connect(exitAct, &QAction::triggered,
-                    parent, &MainWindow::close);
+                    parent->parent(), &TexGenApplication::quit);
 
    clearAct = new QAction("Cl&ear scene", parent);
    clearAct->setToolTip("Clear screen");
@@ -158,6 +164,7 @@ MenuActions::MenuActions(MainWindow* parent)
    fileMenu->addSeparator();
    fileMenu->addAction(saveImageAct);
    fileMenu->addSeparator();
+   fileMenu->addAction(closeAct);
    fileMenu->addAction(exitAct);
 
    editMenu->addAction(clearAct);
@@ -376,7 +383,7 @@ void MenuActions::windowsChanged()
 {
    while(!windowlistActions.isEmpty()) {
       QAction* currAction = windowlistActions.last();
-      windowlistActions.remove(windowlistActions.size()-1);
+      windowlistActions.remove(windowlistActions.size() - 1);
       viewMenu->removeAction(currAction);
       delete currAction;
    }

gui/menuactions.h

@@ -78,6 +78,7 @@ public slots:
    QAction* saveAct;
    QAction* saveAsAct;
    QAction* saveImageAct;
+   QAction* closeAct;
    QAction* exitAct;
    QAction* clearAct;
    QAction* copyAct;

texgenapplication.cpp

@@ -29,8 +29,10 @@ TexGenApplication::TexGenApplication(int argc, char * argv[]) : QApplication(arg
  */
 void TexGenApplication::quit()
 {
-   while (!mainwindows.isEmpty()) {
-      if (mainwindows.last()->close() == false) {
+   QMutableVectorIterator<MainWindow*> it(mainwindows);
+   it.toBack();
+   while (it.hasPrevious()) {
+      if (it.previous()->close() == false) {
          return;
       }
    }
@@ -45,6 +47,8 @@ MainWindow* TexGenApplication::addWindow()
    MainWindow* newWindow = new MainWindow(this);
    QObject::connect(newWindow, &MainWindow::windowTitleChanged,
                     this, &TexGenApplication::windowUpdated);
+   QObject::connect(newWindow, &MainWindow::destroyed,
+                    this, &TexGenApplication::removeWindow);
    mainwindows.push_back(newWindow);
    newWindow->show();
    emit windowsChanged();
@@ -56,9 +60,9 @@ MainWindow* TexGenApplication::addWindow()
  * @param windowObj The window to be removed.
  * Removes a MainWindows from the window list.
  */
-void TexGenApplication::removeWindow(MainWindow* windowObj)
+void TexGenApplication::removeWindow(QObject* windowObj)
 {
-   int index = mainwindows.indexOf(windowObj);
+   int index = mainwindows.indexOf((MainWindow*) windowObj);
    if (index == -1) {
       return;
    }

texgenapplication.h

@@ -39,7 +39,7 @@ class TexGenApplication : public QApplication
 
 public slots:
    MainWindow* addWindow();
-   void removeWindow(MainWindow*);
+   void removeWindow(QObject*);
    void quit();
    void windowUpdated(QString);