sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget.

Source-pull-request: linuxdeepin/dtkwidget#671

Author: deepin-ci-robot

src/widgets/dlistview.cpp

@@ -776,14 +776,6 @@ void DListView::setBackgroundType(DStyledItemDelegate::BackgroundType background
 {
     if (DStyledItemDelegate *d = qobject_cast<DStyledItemDelegate *>(itemDelegate())) {
         d->setBackgroundType(backgroundType);
-
-        if (d->backgroundType() == DStyledItemDelegate::RoundedBackground) {
-            d->setItemSpacing(10);
-        } else if (d->backgroundType() == DStyledItemDelegate::ClipCornerBackground) {
-            d->setItemSpacing(1);
-        } else {
-            d->setItemSpacing(0);
-        }
     }
 }
 

src/widgets/dstyleditemdelegate.cpp

@@ -516,10 +516,23 @@ class DStyledItemDelegatePrivate : public DCORE_NAMESPACE::DObjectPrivate
         }
     }
 
+
+    inline int itemSpacing() const
+    {
+        if (spacing >= 0) 
+            return spacing;
+        const auto type = backgroundType & DStyledItemDelegate::BackgroundType_Mask;
+        if (type == DStyledItemDelegate::RoundedBackground)
+            return 10;
+        if (type == DStyledItemDelegate::ClipCornerBackground)
+            return 1;
+        return 0;
+    }
+
     DStyledItemDelegate::BackgroundType backgroundType = DStyledItemDelegate::NoBackground;
     QMargins margins;
     QSize itemSize;
-    int itemSpacing = 0;
+    int spacing = -1;
     QMap<QModelIndex, QList<QPair<QAction*, QRect>>> clickableActionMap;
     QAction *pressedAction = nullptr;
     QList<QPointer<QWidget>> lastWidgets;
@@ -1176,9 +1189,9 @@ QSize DStyledItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QM
     const QListView * lv = qobject_cast<const QListView*>(option.widget);
     if (lv) {
         if (lv->flow() == QListView::LeftToRight) {
-            size.rwidth() += d->itemSpacing;
+            size.rwidth() += d->itemSpacing();
         } else {
-            size.rheight() += d->itemSpacing;
+            size.rheight() += d->itemSpacing();
         }
     }
 
@@ -1253,7 +1266,7 @@ int DStyledItemDelegate::spacing() const
 {
     D_DC(DStyledItemDelegate);
 
-    return d->itemSpacing;
+    return d->itemSpacing();
 }
 
 void DStyledItemDelegate::setBackgroundType(DStyledItemDelegate::BackgroundType type)
@@ -1297,7 +1310,7 @@ void DStyledItemDelegate::setItemSpacing(int spacing)
 {
     D_D(DStyledItemDelegate);
 
-    d->itemSpacing = spacing;
+    d->spacing = spacing;
 }
 
 void DStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const
@@ -1353,9 +1366,9 @@ void DStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option, const QM
     const QListView * lv = qobject_cast<const QListView*>(option->widget);
     if (lv) {
         if (lv->flow() == QListView::LeftToRight) {
-            option->rect.adjust(0, 0, 0 - d->itemSpacing, 0);
+            option->rect.adjust(0, 0, 0 - d->itemSpacing(), 0);
         } else {
-            option->rect.adjust(0, 0, 0, 0 - d->itemSpacing);
+            option->rect.adjust(0, 0, 0, 0 - d->itemSpacing());
         }
         if (lv->window() && lv->window()->isActiveWindow()) {
             option->state |= QStyle::State_Active;