sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#563
linuxdeepin · Apr 9, 2024 · c2c41d0 · c2c41d0
1 parent c1420ba
commit c2c41d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/include/widgets/dlistview.h b/include/widgets/dlistview.h
@@ -112,6 +112,8 @@ public Q_SLOTS:
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QStyleOptionViewItem viewOptions() const override;
+#else
+    void initViewItemOption(QStyleOptionViewItem *option) const override;
 #endif
     virtual QModelIndex moveCursor(CursorAction cursorAction,
                                    Qt::KeyboardModifiers modifiers) override;

diff --git a/src/widgets/dlistview.cpp b/src/widgets/dlistview.cpp
@@ -921,7 +921,7 @@ bool DListView::edit(const QModelIndex &index, QAbstractItemView::EditTrigger tr
     return tmp;
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) //TODO: error Maybe
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 QStyleOptionViewItem DListView::viewOptions() const
 {
     QStyleOptionViewItem item = QListView::viewOptions();
@@ -936,6 +936,20 @@ QStyleOptionViewItem DListView::viewOptions() const
 
     return item;
 }
+#else
+/*!
+  \reimp
+*/
+void DListView::initViewItemOption(QStyleOptionViewItem *option) const
+{
+    QListView::initViewItemOption(option);
+    option->showDecorationSelected = true;
+    // 列表项不会变为Inactive状态
+    option->state |= QStyle::State_Active;
+    if (viewMode() == QListView::ListMode) {
+        option->decorationAlignment = Qt::AlignVCenter;
+    }
+}
 #endif
 
 QModelIndex DListView::moveCursor(QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers)