fix: Fix the issue where removing an item from the dropdown list does not cancel the highlight

Fix the issue where removing an item from the dropdown list does not cancel the highlight

Log: Fix the issue where removing an item from the dropdown list does not cancel the highlight
pms: BUG-306683
            BUG-304991

Author: pengfeixx

qt6/src/qml/ComboBox.qml

@@ -4,6 +4,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Controls
 import QtQuick.Templates as T
 import org.deepin.dtk 1.0 as D
 import org.deepin.dtk.style 1.0 as DS
@@ -20,6 +21,7 @@ T.ComboBox {
     property D.Palette separatorColor: DS.Style.comboBox.edit.separator
     property var horizontalAlignment: control.flat ? Text.AlignRight : Text.AlignLeft
     opacity: enabled ? 1.0 : 0.4
+    property bool forceNoHighlight: false
 
     implicitWidth: DS.Style.control.implicitWidth(control)
     implicitHeight: DS.Style.control.implicitHeight(control)
@@ -34,7 +36,7 @@ T.ComboBox {
         useIndicatorPadding: true
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : (model[control.textRole] === undefined ? modelData[control.textRole] : model[control.textRole])) : modelData
         icon.name: (control.iconNameRole && model[control.iconNameRole] !== undefined) ? model[control.iconNameRole] : null
-        highlighted: control.highlightedIndex === index
+        highlighted: !control.forceNoHighlight && control.highlightedIndex === index        
         hoverEnabled: control.hoverEnabled
         autoExclusive: true
         checked: control.currentIndex === index
@@ -165,13 +167,31 @@ T.ComboBox {
         rightMargin: DS.Style.popup.margin
         palette: control.palette
         implicitWidth: control.flat ? Math.max(contentItem.implicitWidth, control.width) : control.width
-        contentItem: ArrowListView {
-            clip: true
-            maxVisibleItems: control.maxVisibleItems
-            view.model: control.delegateModel
-            view.currentIndex: control.highlightedIndex
-            view.highlightRangeMode: ListView.ApplyRange
-            view.highlightMoveDuration: 0
+        contentItem: Item {
+            implicitWidth: arrowListView.implicitWidth
+            implicitHeight: arrowListView.implicitHeight
+            
+            HoverHandler {
+                id: comboBoxHoverHandler
+                target: arrowListView
+                onHoveredChanged: {
+                    if (!hovered) {
+                        control.forceNoHighlight = true
+                    } else {
+                        control.forceNoHighlight = false
+                    }
+                }
+            }
+            
+            ArrowListView {
+                id: arrowListView
+                anchors.fill: parent
+                clip: true
+                maxVisibleItems: control.maxVisibleItems
+                view.model: control.delegateModel
+                view.highlightRangeMode: ListView.ApplyRange
+                view.highlightMoveDuration: 0
+            }
         }
 
         background: FloatingPanel {

qt6/src/qml/Menu.qml

@@ -47,6 +47,28 @@ T.Menu {
         // QTBUG-99897 focus doesn't be clear.
         implicitWidth: viewLayout.implicitWidth
         implicitHeight: viewLayout.implicitHeight
+        
+        HoverHandler {
+            id: menuHoverHandler
+            target: viewLayout
+            onHoveredChanged: {
+                if (!hovered) {
+                    var currentItem = control.itemAt(control.currentIndex)
+                    var hasOpenSubMenu = false
+                    
+                    if (currentItem) {
+                        if (currentItem.subMenu && currentItem.subMenu.visible) {
+                            hasOpenSubMenu = true
+                        }
+                    }
+                    
+                    if (!hasOpenSubMenu) {
+                        control.currentIndex = -1
+                    }
+                }
+            }
+        }
+        
         ColumnLayout {
             id: viewLayout
             spacing: 0