Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions qt6/src/qml/ArrowListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,23 @@ FocusScope {
return 0
const item = itemsView.itemAtIndex(0)
const measured = itemsView.contentHeight > 0 && item ? (item.height || item.implicitHeight) : 0
const arrowStrips = itemsView.count > maxVisibleItems
? 2 * (DS.Style.arrowListView.stepButtonIconSize.height + contentLayout.spacing) : 0
return Math.min(itemsView.count, maxVisibleItems) * (measured > 0 ? measured : itemHeight) + arrowStrips
const arrowStrips = 2 * (DS.Style.arrowListView.stepButtonSize.height + contentLayout.spacing)
return Math.min(itemsView.count, maxVisibleItems) * (measured > 0 ? measured : itemHeight) + arrowStrips + contentLayout.anchors.topMargin
}

implicitWidth: Math.max(DS.Style.arrowListView.width, contentLayout.implicitWidth)
implicitHeight: contentLayout.implicitHeight
implicitHeight: contentLayout.implicitHeight + contentLayout.anchors.topMargin

ColumnLayout {
id: contentLayout
anchors.fill: parent
anchors.topMargin: 6
spacing: 6
P.ArrowListViewButton {
visible: itemsView.interactive
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.preferredHeight: DS.Style.arrowListView.stepButtonIconSize.height
Layout.preferredHeight: DS.Style.arrowListView.stepButtonSize.height
Layout.minimumHeight: DS.Style.arrowListView.stepButtonSize.height
view: itemsView
stepSize: control.itemHeight
direction: P.ArrowListViewButton.UpButton
Expand Down Expand Up @@ -90,10 +91,10 @@ FocusScope {
}

P.ArrowListViewButton {
visible: itemsView.interactive
Comment thread
zqq-dora marked this conversation as resolved.
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.preferredHeight: DS.Style.arrowListView.stepButtonIconSize.height
Layout.preferredHeight: DS.Style.arrowListView.stepButtonSize.height
Layout.minimumHeight: DS.Style.arrowListView.stepButtonSize.height
view: itemsView
stepSize: control.itemHeight
direction: P.ArrowListViewButton.DownButton
Expand Down
3 changes: 1 addition & 2 deletions qt6/src/qml/private/ArrowListViewButton.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand All @@ -15,7 +15,6 @@ Loader {
required property Item view
property int direction
property int stepSize: DS.Style.arrowListView.itemHeight
active: view.interactive
Comment thread
zqq-dora marked this conversation as resolved.

sourceComponent: ActionButton {
palette.windowText: undefined
Expand Down
Loading