From cb411aa7f9d896048716e037153ed722275aa530 Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Tue, 17 Dec 2024 09:41:54 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/436 --- qt6/src/qml/ArrowListView.qml | 1 + qt6/src/qml/LineEdit.qml | 2 +- src/qml/ArrowListView.qml | 1 + src/qml/LineEdit.qml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qt6/src/qml/ArrowListView.qml b/qt6/src/qml/ArrowListView.qml index ec16f967..ccc5718b 100644 --- a/qt6/src/qml/ArrowListView.qml +++ b/qt6/src/qml/ArrowListView.qml @@ -32,6 +32,7 @@ FocusScope { ListView { id: itemsView + clip: true Layout.fillWidth: true Layout.fillHeight: true implicitHeight: Math.min(contentHeight, maxVisibleItems * itemHeight) diff --git a/qt6/src/qml/LineEdit.qml b/qt6/src/qml/LineEdit.qml index 990be3b0..1ea7249d 100644 --- a/qt6/src/qml/LineEdit.qml +++ b/qt6/src/qml/LineEdit.qml @@ -10,7 +10,7 @@ TextField { id: control readonly property alias clearButton: clearBtn - rightPadding: clearBtn.active ? (clearBtn.width + clearBtn.anchors.rightMargin) : 0 + rightPadding: clearBtn.active ? (clearBtn.width + clearBtn.anchors.rightMargin) : 10 selectByMouse: true Loader { diff --git a/src/qml/ArrowListView.qml b/src/qml/ArrowListView.qml index d87f47d3..19a0a50c 100644 --- a/src/qml/ArrowListView.qml +++ b/src/qml/ArrowListView.qml @@ -34,6 +34,7 @@ FocusScope { Layout.fillWidth: true Layout.fillHeight: true implicitHeight: Math.min(contentHeight, maxVisibleItems * itemHeight) + clip: true implicitWidth:{ var maxWidth = DS.Style.arrowListView.width if (!itemsView.model || !itemsView.model.hasOwnProperty("get")) diff --git a/src/qml/LineEdit.qml b/src/qml/LineEdit.qml index 4e113e4d..b44b4b6f 100644 --- a/src/qml/LineEdit.qml +++ b/src/qml/LineEdit.qml @@ -10,7 +10,7 @@ TextField { id: control readonly property alias clearButton: clearBtn - rightPadding: clearBtn.active ? (clearBtn.width + clearBtn.anchors.rightMargin) : 0 + rightPadding: clearBtn.active ? (clearBtn.width + clearBtn.anchors.rightMargin) : 10 selectByMouse: true Loader {