fix: clear DComboBox popup highlight on mouse leave

examples/collections/buttonexample.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 - 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -855,7 +855,7 @@ DComboBoxExample::DComboBoxExample(QWidget *parent)
     }
     pHBoxLayout_1->addWidget(pComboBox_1);
 
-    QComboBox *pComboBox_1_count = new QComboBox();
+    DComboBox *pComboBox_1_count = new DComboBox();
     pComboBox_1_count->setFixedWidth(100);
     pComboBox_1_count->addItem(QString::number(10));
     pComboBox_1_count->addItem(QString::number(20));

include/widgets/dcombobox.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2021 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -26,6 +26,7 @@ class LIBDTKWIDGETSHARED_EXPORT DComboBox : public QComboBox, public DCORE_NAMES
     // QComboBox interface
 public:
     virtual void showPopup() override;
+    virtual bool eventFilter(QObject *watched, QEvent *event) override;
 };
 
 DWIDGET_END_NAMESPACE

src/widgets/dcombobox.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2021 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -14,19 +14,21 @@
 #endif
 
 #include <private/qabstractscrollarea_p.h>
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformtheme.h>
 
+#include <QAbstractItemView>
 #include <QListView>
 #include <QTableView>
 #include <QItemDelegate>
 #include <QTreeView>
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QDesktopWidget>
 #endif
 #include <QLayout>
 #include <QScrollBar>
 #include <QHeaderView>
+#include <QCursor>
 #include <QScreen>
 #include <QStack>
 #include <QWindow>
@@ -147,10 +149,28 @@
         }
         return count;
     };
+
+    auto installPopupEventFilters = [this] {
+        QComboBoxPrivateContainer *popupContainer = this->findChild<QComboBoxPrivateContainer *>();
+        if (!popupContainer)
+            return;
+
+        popupContainer->installEventFilter(this);
+        view()->installEventFilter(this);
+        view()->viewport()->installEventFilter(this);
+    };
+
+    d->popupIndexBeforeLeave = QModelIndex();
+    d->popupIndexClearedByLeave = false;
+
     // When the value of maxVisibleItems() is less than 16, use the default value of qt and return it directly to avoid displaying excess whitespace
     QComboBoxPrivateContainer *container = this->findChild<QComboBoxPrivateContainer *>();
-    if (getRowCount() <= maxVisibleItems() || !container)
-        return QComboBox::showPopup();
+    if (getRowCount() <= maxVisibleItems() || !container) {
+        QComboBox::showPopup();
+        installPopupEventFilters();
+        return;
+    }
+    installPopupEventFilters();
 
     // Calculate maximum height by maximum item size
     QStyle * const style = this->style();
@@ -263,4 +283,48 @@
     container->move(container->x(), newY);
 }
 
+bool DComboBox::eventFilter(QObject *watched, QEvent *event)
+{
+    D_D(DComboBox);
+
+    QComboBoxPrivateContainer *container = this->findChild<QComboBoxPrivateContainer *>();
+    QAbstractItemView *popupView = view();
+    QWidget *viewport = popupView ? popupView->viewport() : nullptr;
+    const bool isPopupObject = watched == container || watched == popupView || watched == viewport;
+
+    if (isPopupObject) {
+        switch (event->type()) {
+        case QEvent::Leave:
+            if (popupView && popupView->currentIndex().isValid() && container
+                    && !container->rect().contains(container->mapFromGlobal(QCursor::pos()))) {
+                d->popupIndexBeforeLeave = popupView->currentIndex();
+                d->popupIndexClearedByLeave = true;
+                popupView->setCurrentIndex(QModelIndex());
+            }
+            break;
+        case QEvent::MouseMove:
+        case QEvent::MouseButtonPress:
+        case QEvent::MouseButtonRelease:
+            d->popupIndexClearedByLeave = false;
+            break;
+        case QEvent::KeyPress:
+        case QEvent::ShortcutOverride:
+            if (d->popupIndexClearedByLeave && popupView && !popupView->currentIndex().isValid()
+                    && d->popupIndexBeforeLeave.isValid()) {
+                popupView->setCurrentIndex(d->popupIndexBeforeLeave);
+            }
+            d->popupIndexClearedByLeave = false;
+            break;
+        case QEvent::Hide:
+            d->popupIndexBeforeLeave = QModelIndex();
+            d->popupIndexClearedByLeave = false;
+            break;
+        default:
+            break;
+        }
+    }
+
+    return QComboBox::eventFilter(watched, event);
+}
+
 DWIDGET_END_NAMESPACE

src/widgets/private/dcombobox_p.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2021 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -7,6 +7,7 @@
 
 #include "dcombobox.h"
 #include <DObjectPrivate>
+#include <QPersistentModelIndex>
 
 DWIDGET_BEGIN_NAMESPACE
 
@@ -26,9 +27,11 @@ class DComboBoxPrivate : public DCORE_NAMESPACE::DObjectPrivate
 
     // 最大显示项数
     static const int MaxVisibleItems = 16;
+
+    QPersistentModelIndex popupIndexBeforeLeave;
+    bool popupIndexClearedByLeave = false;
 };
 
 DWIDGET_END_NAMESPACE
 
 #endif // DCOMBOBOX_P_H
-

tests/testcases/widgets/ut_dcombobox.cpp

@@ -1,10 +1,9 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include <gtest/gtest.h>
 #include <QTest>
-
 #include "private/qcombobox_p.h"
 #include "dcombobox.h"
 DWIDGET_USE_NAMESPACE
@@ -46,3 +45,35 @@ TEST_F(ut_DComboBox, maxVisibleItems)
     QTest::mouseClick(target, Qt::LeftButton, Qt::KeyboardModifiers(), arrowPos);
     ASSERT_EQ(container->rect().height(), oldRect.height());
 }
+
+TEST_F(ut_DComboBox, popupLeaveClearsHighlightButPreservesKeyboardBase)
+{
+    for (int i = 0; i < 5; ++i)
+        target->addItem(QString::number(i));
+
+    target->setCurrentIndex(2);
+    target->show();
+    (void)QTest::qWaitForWindowExposed(target->windowHandle());
+
+    const QPoint arrowPos(target->rect().right() - 1, target->rect().center().y());
+    QTest::mouseClick(target, Qt::LeftButton, Qt::KeyboardModifiers(), arrowPos);
+
+    auto container = target->findChild<QComboBoxPrivateContainer *>();
+    ASSERT_TRUE(container);
+
+    auto popupView = target->view();
+    ASSERT_TRUE(popupView);
+
+    popupView->setCurrentIndex(target->model()->index(4, target->modelColumn(), target->rootModelIndex()));
+    ASSERT_TRUE(popupView->currentIndex().isValid());
+
+    QCursor::setPos(target->mapToGlobal(QPoint(-20, -20)));
+    QEvent leaveEvent(QEvent::Leave);
+    QCoreApplication::sendEvent(container, &leaveEvent);
+    ASSERT_FALSE(popupView->currentIndex().isValid());
+
+    QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier);
+    QCoreApplication::sendEvent(popupView, &keyEvent);
+    ASSERT_TRUE(popupView->currentIndex().isValid());
+    ASSERT_EQ(popupView->currentIndex().row(), 3);
+}