From 9d5956585c40bca6813f85d112ae50fe83c97ecd Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 8 Jul 2014 09:08:01 +0200
Subject: [PATCH] added separate display type for colours

---
 apps/opencs/model/world/columnbase.hpp | 3 ++-
 apps/opencs/model/world/columnimp.hpp  | 2 +-
 apps/opencs/view/world/util.cpp        | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 39c700fa1..149a71d42 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -92,7 +92,8 @@ namespace CSMWorld
             Display_EnchantmentType,
             Display_BodyPartType,
             Display_MeshType,
-            Display_Gender
+            Display_Gender,
+            Display_Colour
         };
 
         int mColumnId;
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 72f2099fa..ebd5756d0 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -634,7 +634,7 @@ namespace CSMWorld
     {
         /// \todo Replace Display_Integer with something that displays the colour value more directly.
         MapColourColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Integer)
+        : Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Colour)
         {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 6f3999363..5d26b75c4 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -145,10 +145,11 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
 
     if (display != CSMWorld::ColumnBase::Display_None)
     {
-        if (variant.type() == QVariant::Color)
+        if (display == CSMWorld::ColumnBase::Display_Colour)
         {
             return new QLineEdit(parent);
         }
+
         if (display == CSMWorld::ColumnBase::Display_Integer)
         {
             return new QSpinBox(parent);