sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#450
linuxdeepin · Jan 8, 2025 · 74d9b68 · 74d9b68
1 parent b827ea4
commit 74d9b68
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/qt6/src/qml/ArrowListView.qml b/qt6/src/qml/ArrowListView.qml
@@ -51,8 +51,7 @@ FocusScope {
             interactive: Window.window ? (contentHeight > Window.window.height || model.count > maxVisibleItems) : false
             ScrollIndicator.vertical: ScrollIndicator { }
             highlight: HighlightPanel {
-                anchors.left: parent.left
-                anchors.right: parent.right
+                visible: false // TODO listview's highlight is confict with Item's highlight.
                 outerShadowColor: null
                 innerShadowColor: null
                 scale: D.DTK.hasAnimation ? 0.9 : 1.0

diff --git a/qt6/src/qml/ComboBox.qml b/qt6/src/qml/ComboBox.qml
@@ -30,14 +30,14 @@ T.ComboBox {
     rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
 
     delegate: MenuItem {
+        implicitWidth: ListView.view.width
         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
         hoverEnabled: control.hoverEnabled
         autoExclusive: true
         checked: control.currentIndex === index
-        background: null
     }
 
     indicator: Loader {

diff --git a/qt6/src/qml/Menu.qml b/qt6/src/qml/Menu.qml
@@ -37,9 +37,7 @@ T.Menu {
     topPadding: DS.Style.menu.topPadding
     bottomPadding: topPadding
 
-    delegate: MenuItem { 
-        background: null
-    }
+    delegate: MenuItem { }
 
     D.PopupHandle.delegate: PopupWindow {
         blurControl: control
@@ -89,6 +87,7 @@ T.Menu {
 
                 view.highlight: HighlightPanel {
                     id: highlightRect
+                    visible: false // TODO listview's highlight is confict with Item's highlight.
                     anchors.left: parent ? parent.left : undefined
                     anchors.right: parent ? parent.right : undefined
                     anchors.leftMargin: 0