From 6cfee630aaa24edff56efa9fc1b124272c2e1f92 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Tue, 16 Jun 2015 21:25:06 +0300
Subject: [PATCH] Proper size hint for DataDisplayDelegate

---
 .../opencs/view/world/datadisplaydelegate.cpp | 39 ++++++++++++++-----
 .../opencs/view/world/datadisplaydelegate.hpp |  7 ++--
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/view/world/datadisplaydelegate.cpp b/apps/opencs/view/world/datadisplaydelegate.cpp
index 5f23d95d9..77ed33daa 100644
--- a/apps/opencs/view/world/datadisplaydelegate.cpp
+++ b/apps/opencs/view/world/datadisplaydelegate.cpp
@@ -12,7 +12,8 @@ CSVWorld::DataDisplayDelegate::DataDisplayDelegate(const ValueList &values,
                                                    const QString &settingName,
                                                    QObject *parent)
     : EnumDelegate (values, dispatcher, document, parent), mDisplayMode (Mode_TextOnly),
-      mIcons (icons), mIconSize (QSize(16, 16)), mIconLeftOffset(3),
+      mIcons (icons), mIconSize (QSize(16, 16)),
+      mHorizontalMargin(QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1),
       mTextLeftOffset(8), mSettingKey (pageName + '/' + settingName)
 {
     buildPixmaps();
@@ -43,16 +44,36 @@ void CSVWorld::DataDisplayDelegate::setIconSize(const QSize& size)
     buildPixmaps();
 }
 
-void CSVWorld::DataDisplayDelegate::setIconLeftOffset(int offset)
-{
-    mIconLeftOffset = offset;
-}
-
 void CSVWorld::DataDisplayDelegate::setTextLeftOffset(int offset)
 {
     mTextLeftOffset = offset;
 }
 
+QSize CSVWorld::DataDisplayDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    QSize size = EnumDelegate::sizeHint(option, index);
+    
+    int valueIndex = getValueIndex(index);
+    if (valueIndex != -1)
+    {
+        if (mDisplayMode == Mode_IconOnly)
+        {
+            size.setWidth(mIconSize.width() + 2 * mHorizontalMargin);
+        }
+        else if (mDisplayMode == Mode_IconAndText)
+        {
+            int valueWidth = option.fontMetrics.width(mValues.at(valueIndex).second);
+            size.setWidth(size.width() + mIconSize.width() + mTextLeftOffset);
+        }
+
+        if (mDisplayMode != Mode_TextOnly)
+        {
+            size.setHeight(qMax(size.height(), mIconSize.height()));
+        }
+    }
+    return size;
+}
+
 void CSVWorld::DataDisplayDelegate::paint (QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     painter->save();
@@ -77,13 +98,13 @@ void CSVWorld::DataDisplayDelegate::paintIcon (QPainter *painter, const QStyleOp
     QRect iconRect = option.rect;
     QRect textRect = iconRect;
 
-    iconRect.setLeft(iconRect.left() + mIconLeftOffset);
-    iconRect.setRight(option.rect.right());
+    iconRect.setLeft(iconRect.left() + mHorizontalMargin);
+    iconRect.setRight(option.rect.right() - mHorizontalMargin);
     if (mDisplayMode == Mode_IconAndText)
     {
         iconRect.setWidth(mIconSize.width());
         textRect.setLeft(iconRect.right() + mTextLeftOffset);
-        textRect.setRight(option.rect.right());
+        textRect.setRight(option.rect.right() - mHorizontalMargin);
 
         QString text = option.fontMetrics.elidedText(mValues.at(index).second, 
                                                      option.textElideMode,
diff --git a/apps/opencs/view/world/datadisplaydelegate.hpp b/apps/opencs/view/world/datadisplaydelegate.hpp
index 07fa1fd8d..e565a3469 100755
--- a/apps/opencs/view/world/datadisplaydelegate.hpp
+++ b/apps/opencs/view/world/datadisplaydelegate.hpp
@@ -31,7 +31,7 @@ namespace CSVWorld
 
         std::vector <std::pair <int, QPixmap> > mPixmaps;
         QSize mIconSize;
-        int mIconLeftOffset;
+        int mHorizontalMargin;
         int mTextLeftOffset;
 
         QString mSettingKey;
@@ -45,12 +45,11 @@ namespace CSVWorld
 
         virtual void paint (QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
+        virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
         /// pass a QSize defining height / width of icon. Default is QSize (16,16).
         void setIconSize (const QSize& icon);
 
-        /// offset the horizontal position of the icon from the left edge of the cell.  Default is 3 pixels.
-        void setIconLeftOffset (int offset);
-
         /// offset the horizontal position of the text from the right edge of the icon.  Default is 8 pixels.
         void setTextLeftOffset (int offset);