From 516a3b9abd27c126bc8864f02bcb2e50303a8939 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 6 Mar 2014 16:40:08 +0100
Subject: [PATCH] close interior cell view when cell is deleted

---
 .../view/render/unpagedworldspacewidget.cpp   | 22 ++++++++++++-------
 apps/opencs/view/render/worldspacewidget.hpp  |  4 ++++
 apps/opencs/view/world/scenesubview.cpp       |  7 ++++++
 apps/opencs/view/world/scenesubview.hpp       |  4 ++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 812a3b165..c7edbe79b 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -38,13 +38,21 @@ CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string&
 void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
-    QModelIndex cellIndex = mCellsModel->getModelIndex (mCellId, 0);
+    int index = mCellsModel->findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+    QModelIndex cellIndex = mCellsModel->getModelIndex (mCellId, index);
 
-    if (cellIndex.row()>=topLeft.row() && cellIndex.row()<bottomRight.row())
+    if (cellIndex.row()>=topLeft.row() && cellIndex.row()<=bottomRight.row())
     {
-        /// \todo possible optimisation: check columns and update only if relevant columns have
-        /// changed
-        update();
+        if (mCellsModel->data (cellIndex).toInt()==CSMWorld::RecordBase::State_Deleted)
+        {
+            emit closeRequest();
+        }
+        else
+        {
+            /// \todo possible optimisation: check columns and update only if relevant columns have
+            /// changed
+            update();
+        }
     }
 }
 
@@ -54,7 +62,5 @@ void CSVRender::UnpagedWorldspaceWidget::cellRowsAboutToBeRemoved (const QModelI
     QModelIndex cellIndex = mCellsModel->getModelIndex (mCellId, 0);
 
     if (cellIndex.row()>=start && cellIndex.row()<=end)
-    {
-
-    }
+        emit closeRequest();
 }
\ No newline at end of file
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 9d9452c17..2eccca3bf 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -36,6 +36,10 @@ namespace CSVRender
         private slots:
 
             void selectNavigationMode (const std::string& mode);
+
+        signals:
+
+            void closeRequest();
     };
 }
 
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index d04cc4c15..3601ae094 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -59,6 +59,8 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D
     setWidget (widget);
 
     mScene->selectDefaultNavigationMode();
+
+    connect (mScene, SIGNAL (closeRequest()), this, SLOT (closeRequest()));
 }
 
 void CSVWorld::SceneSubView::setEditLock (bool locked)
@@ -77,3 +79,8 @@ void CSVWorld::SceneSubView::setStatusBar (bool show)
 {
     mBottom->setStatusBar (show);
 }
+
+void CSVWorld::SceneSubView::closeRequest()
+{
+    deleteLater();
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/scenesubview.hpp b/apps/opencs/view/world/scenesubview.hpp
index 21b3dc204..ecf3fe4e4 100644
--- a/apps/opencs/view/world/scenesubview.hpp
+++ b/apps/opencs/view/world/scenesubview.hpp
@@ -37,6 +37,10 @@ namespace CSVWorld
             virtual void updateEditorSetting (const QString& key, const QString& value);
 
             virtual void setStatusBar (bool show);
+
+        private slots:
+
+            void closeRequest();
     };
 }