Fix region colors

apps/opencs/model/world/columnimp.hpp

@@ -692,32 +692,23 @@ namespace CSMWorld
         }
     };
 
-    /// \todo QColor is a GUI class and should not be in model. Need to think of an alternative
-    /// solution.
     template<typename ESXRecordT>
     struct MapColourColumn : public Column<ESXRecordT>
     {
-        /// \todo Replace Display_Integer with something that displays the colour value more directly.
         MapColourColumn()
         : Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Colour)
         {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
-            int colour = record.get().mMapColor;
+            return record.get().mMapColor;
-
-            return QColor (colour & 0xff, (colour>>8) & 0xff, (colour>>16) & 0xff);
         }
 
         virtual void set (Record<ESXRecordT>& record, const QVariant& data)
         {
-            ESXRecordT record2 = record.get();
+            ESXRecordT copy = record.get();
-
+            copy.mMapColor = data.toInt();
-            QColor colour = data.value<QColor>();
+            record.setModified (copy);
-
-            record2.mMapColor = (colour.blue() << 16) | (colour.green() << 8) | colour.red();
-
-            record.setModified (record2);
         }
 
         virtual bool isEditable() const

apps/opencs/view/world/colordelegate.cpp

@@ -5,29 +5,32 @@
 
 #include "../widget/coloreditor.hpp"
 
-CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher, 
+CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher,
-                                       CSMDoc::Document& document, 
+                                       CSMDoc::Document& document,
                                        QObject *parent)
     : CommandDelegate(dispatcher, document, parent)
 {}
 
-void CSVWorld::ColorDelegate::paint(QPainter *painter, 
+void CSVWorld::ColorDelegate::paint(QPainter *painter,
                                     const QStyleOptionViewItem &option,
                                     const QModelIndex &index) const
 {
+    int colorInt = index.data().toInt();
+    QColor color(colorInt & 0xff, (colorInt >> 8) & 0xff, (colorInt >> 16) & 0xff);
+
     QRect coloredRect(option.rect.x() + qRound(option.rect.width() / 4.0),
                       option.rect.y() + qRound(option.rect.height() / 4.0),
                       option.rect.width() / 2,
                       option.rect.height() / 2);
     painter->save();
-    painter->fillRect(coloredRect, index.data().value<QColor>());
+    painter->fillRect(coloredRect, color);
     painter->setPen(Qt::black);
     painter->drawRect(coloredRect);
     painter->restore();
 }
 
-CSVWorld::CommandDelegate *CSVWorld::ColorDelegateFactory::makeDelegate(CSMWorld::CommandDispatcher *dispatcher, 
+CSVWorld::CommandDelegate *CSVWorld::ColorDelegateFactory::makeDelegate(CSMWorld::CommandDispatcher *dispatcher,
-                                                                        CSMDoc::Document &document, 
+                                                                        CSMDoc::Document &document,
                                                                         QObject *parent) const
 {
     return new ColorDelegate(dispatcher, document, parent);