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/ArrowListView.qml

@@ -14,10 +14,18 @@ FocusScope {
     property int maxVisibleItems : DS.Style.arrowListView.maxVisibleItems
     property int itemHeight:  DS.Style.arrowListView.itemHeight
     property alias view: itemsView
+    property bool hovered: false
 
     implicitWidth: Math.max(DS.Style.arrowListView.width, contentLayout.implicitWidth)
     implicitHeight: contentLayout.implicitHeight
 
+    HoverHandler {
+        target: itemsView
+        onHoveredChanged: {
+            control.hovered = hovered
+        }
+    }
+
     ColumnLayout {
         id: contentLayout
         anchors.fill: parent

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
@@ -34,7 +35,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
+        highlightEnabled: arrowListView.hovered || (control.highlightedIndex === index && subMenu && subMenu.visible)
         hoverEnabled: control.hoverEnabled
         autoExclusive: true
         checked: control.currentIndex === index
@@ -166,6 +167,7 @@ T.ComboBox {
         palette: control.palette
         implicitWidth: control.flat ? Math.max(contentItem.implicitWidth, control.width) : control.width
         contentItem: ArrowListView {
+            id: arrowListView
             clip: true
             maxVisibleItems: control.maxVisibleItems
             view.model: control.delegateModel

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

qt6/src/qml/MenuItem.qml

@@ -10,6 +10,7 @@ import org.deepin.dtk.style 1.0 as DS
 T.MenuItem {
     id: control
 
+    property bool highlightEnabled: true
     property bool useIndicatorPadding: menu && menu.existsChecked || false
     implicitWidth: DS.Style.control.implicitWidth(control)
     implicitHeight: DS.Style.control.implicitHeight(control)
@@ -22,7 +23,7 @@ T.MenuItem {
         width: DS.Style.menu.item.iconSize.height
     }
 
-    property D.Palette textColor: control.highlighted ? DS.Style.checkedButton.text
+    property D.Palette textColor: (control.highlighted && control.highlightEnabled) ? DS.Style.checkedButton.text
                                                       : DS.Style.menu.itemText
     property D.Palette subMenuBackgroundColor: DS.Style.menu.subMenuOpenedBackground
 
@@ -100,7 +101,7 @@ T.MenuItem {
         implicitHeight: DS.Style.menu.item.height
         Loader {
             anchors.fill: parent
-            active: control.highlighted
+            active: control.highlighted && control.highlightEnabled
             sourceComponent: HighlightPanel {
                 outerShadowColor: null
                 innerShadowColor: null