Draw the frame around rect in ColorEditor and ColorPickerDelegate

apps/opencs/view/widget/coloreditor.cpp

@@ -31,6 +31,8 @@ void CSVWidget::ColorEditor::paintEvent(QPaintEvent *event)
                       qRound(buttonRect.height() / 2.0));
     QPainter painter(this);
     painter.fillRect(coloredRect, mColor);
+    painter.setPen(Qt::black);
+    painter.drawRect(coloredRect);
 }
 
 QColor CSVWidget::ColorEditor::color() const

apps/opencs/view/world/colorpickerdelegate.cpp

@@ -15,16 +15,15 @@ void CSVWorld::ColorPickerDelegate::paint(QPainter *painter,
                                           const QStyleOptionViewItem &option,
                                           const QModelIndex &index) const
 {
-    QRect coloredRect = getColoredRect(option);
+    QRect coloredRect(qRound(option.rect.x() + option.rect.width() / 4.0),
+                      qRound(option.rect.y() + option.rect.height() / 4.0),
+                      qRound(option.rect.width() / 2.0),
+                      qRound(option.rect.height() / 2.0));
+    painter->save();
     painter->fillRect(coloredRect, index.data().value<QColor>());
-}
+    painter->setPen(Qt::black);
-
+    painter->drawRect(coloredRect);
-QRect CSVWorld::ColorPickerDelegate::getColoredRect(const QStyleOptionViewItem &option) const
+    painter->restore();
-{
-    return QRect(qRound(option.rect.x() + option.rect.width() / 4.0),
-                 qRound(option.rect.y() + option.rect.height() / 4.0),
-                 qRound(option.rect.width() / 2.0),
-                 qRound(option.rect.height() / 2.0));
 }
 
 CSVWorld::CommandDelegate *CSVWorld::ColorPickerDelegateFactory::makeDelegate(CSMWorld::CommandDispatcher *dispatcher, 

apps/opencs/view/world/colorpickerdelegate.hpp

@@ -14,8 +14,6 @@ namespace CSVWorld
 {
     class ColorPickerDelegate : public CommandDelegate
     {
-            QRect getColoredRect(const QStyleOptionViewItem &option) const;
-
         public:
             ColorPickerDelegate(CSMWorld::CommandDispatcher *dispatcher, 
                                 CSMDoc::Document& document,