fix: MenuItem can't be highlight by keyboard

`highlighted` property is updated by Menu when handling key event.
linuxdeepin · Mar 18, 2024 · 6de0340 · 6de0340
1 parent b19c9a8
commit 6de0340
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/qt6/src/qml/MenuItem.qml b/qt6/src/qml/MenuItem.qml
@@ -10,7 +10,7 @@ import org.deepin.dtk.style 1.0 as DS
 T.MenuItem {
     id: control
 
-    property bool useIndicatorPadding: menu && menu.existsChecked
+    property bool useIndicatorPadding: menu && menu.existsChecked || false
     implicitWidth: DS.Style.control.implicitWidth(control)
     implicitHeight: DS.Style.control.implicitHeight(control)
     baselineOffset: contentItem.y + contentItem.baselineOffset
@@ -104,7 +104,7 @@ T.MenuItem {
 
         Loader {
             anchors.fill: parent
-            active: control.hovered
+            active: control.down || control.highlighted
             sourceComponent: HighlightPanel {}
         }
     }

diff --git a/src/qml/MenuItem.qml b/src/qml/MenuItem.qml
@@ -10,7 +10,7 @@ import org.deepin.dtk.style 1.0 as DS
 T.MenuItem {
     id: control
 
-    property bool useIndicatorPadding: menu && menu.existsChecked
+    property bool useIndicatorPadding: menu && menu.existsChecked || false
     implicitWidth: DS.Style.control.implicitWidth(control)
     implicitHeight: DS.Style.control.implicitHeight(control)
     baselineOffset: contentItem.y + contentItem.baselineOffset
@@ -104,7 +104,7 @@ T.MenuItem {
 
         Loader {
             anchors.fill: parent
-            active: control.hovered
+            active: control.down || control.highlighted
             sourceComponent: HighlightPanel {}
         }
     }