From f84c36b500b09300d49382cdcf4de90449aa32db Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Wed, 3 Jun 2015 00:00:39 +0300
Subject: [PATCH] CommandDelegate: extract a display type from a model if it
 isn't specified

---
 apps/opencs/model/world/idtable.cpp | 3 +++
 apps/opencs/model/world/idtree.cpp  | 3 +++
 apps/opencs/view/world/util.cpp     | 8 +++++++-
 apps/opencs/view/world/util.hpp     | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index bde6412ece..8ca19f7e96 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -33,6 +33,9 @@ QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const
     if (index.row() < 0 || index.column() < 0)
         return QVariant();
 
+    if (role==ColumnBase::Role_Display)
+        return QVariant(mIdCollection->getColumn(index.column()).mDisplayType);
+
     if (role==ColumnBase::Role_ColumnId)
         return QVariant (getColumnId (index.column()));
 
diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp
index a9ec2c4cd6..a3dbae4655 100644
--- a/apps/opencs/model/world/idtree.cpp
+++ b/apps/opencs/model/world/idtree.cpp
@@ -40,6 +40,9 @@ QVariant CSMWorld::IdTree::data  (const QModelIndex & index, int role) const
         std::pair<int, int> parentAddress(unfoldIndexAddress(index.internalId()));
         const NestableColumn *parentColumn = mNestedCollection->getNestableColumn(parentAddress.second);
 
+        if (role == ColumnBase::Role_Display)
+            return parentColumn->nestedColumn(index.column()).mColumnId;
+
         if (role == ColumnBase::Role_ColumnId)
             return parentColumn->nestedColumn(index.column()).mColumnId;
 
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 5452214ef4..3be875ffd7 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -111,6 +111,12 @@ CSMDoc::Document& CSVWorld::CommandDelegate::getDocument() const
     return mDocument;
 }
 
+CSMWorld::ColumnBase::Display CSVWorld::CommandDelegate::getDisplayTypeFromIndex(const QModelIndex &index) const
+{
+    int rawDisplay = index.data(CSMWorld::ColumnBase::Role_Display).toInt();
+    return static_cast<CSMWorld::ColumnBase::Display>(rawDisplay);
+}
+
 void CSVWorld::CommandDelegate::setModelDataImp (QWidget *editor, QAbstractItemModel *model,
     const QModelIndex& index) const
 {
@@ -146,7 +152,7 @@ void CSVWorld::CommandDelegate::setModelData (QWidget *editor, QAbstractItemMode
 QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleOptionViewItem& option,
     const QModelIndex& index) const
 {
-    return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_None);
+    return createEditor (parent, option, index, getDisplayTypeFromIndex(index));
 }
 
 QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleOptionViewItem& option,
diff --git a/apps/opencs/view/world/util.hpp b/apps/opencs/view/world/util.hpp
index a12e6ae369..8355e971cb 100644
--- a/apps/opencs/view/world/util.hpp
+++ b/apps/opencs/view/world/util.hpp
@@ -124,6 +124,8 @@ namespace CSVWorld
 
             CSMDoc::Document& getDocument() const;
 
+            CSMWorld::ColumnBase::Display getDisplayTypeFromIndex(const QModelIndex &index) const;
+
             virtual void setModelDataImp (QWidget *editor, QAbstractItemModel *model,
                 const QModelIndex& index) const;