Skip to content

sync: from linuxdeepin/dtkdeclarative #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Jan 8, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions qt6/src/qml/ArrowListView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion qt6/src/qml/ComboBox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions qt6/src/qml/Menu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading