Skip to content

fix: correct mouse event handling area for icon items #724

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
deepin-bot merged 2 commits into from
Mar 6, 2026
Merged

fix: correct mouse event handling area for icon items #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0303a68
fix: correct mouse event handling area for icon items
18202781743 Mar 6, 2026
d4ef003
chore: bump version to 2.0.30
18202781743 Mar 6, 2026
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
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dde-launchpad (2.0.30) unstable; urgency=medium

* fix: correct mouse event handling area for icon items

-- YeShanShan <yeshanshan@uniontech.com> Fri, 06 Mar 2026 16:16:24 +0800

dde-launchpad (2.0.29) unstable; urgency=medium

* fix: fix font weight property assignment
Expand Down
41 changes: 20 additions & 21 deletions qml/windowed/IconItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,26 @@ Control {
ColorSelector.pressed: false
ColorSelector.family: Palette.CrystalColor
flat: true
MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: false
acceptedButtons: Qt.LeftButton
enabled: root.dndEnabled
drag.target: root
onPressed: function (mouse) {
if (mouse.button === Qt.LeftButton && root.dndEnabled) {
appIcon.grabToImage(function(result) {
root.Drag.imageSource = result.url;
})
}
}
onClicked: {
if (!drag.active) {
root.itemClicked()
}
}
}
contentItem: Column {
anchors.fill: parent

Expand Down Expand Up @@ -73,27 +93,6 @@ Control {
palette: DTK.makeIconPalette(root.palette)
theme: ApplicationHelper.DarkType
}

MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: false
acceptedButtons: Qt.LeftButton
enabled: root.dndEnabled
drag.target: root
onPressed: function (mouse) {
if (mouse.button === Qt.LeftButton && root.dndEnabled) {
appIcon.grabToImage(function(result) {
root.Drag.imageSource = result.url;
})
}
}
onClicked: {
if (!drag.active) {
root.itemClicked()
}
}
}
}

// as topMargin
Expand Down