Skip to content

fix: allow right-click long press to trigger context menu on touchscreen #755

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 1 commit into from
May 7, 2026
+77 −28
Merged

fix: allow right-click long press to trigger context menu on touchscreen #755

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
25 changes: 19 additions & 6 deletions qml/IconItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,21 @@ Control {
hoverEnabled: false
drag.target: root.dndEnabled ? root : null
drag.threshold: 1

// 记录是否是触摸长按导致的，防止在 onClicked 中重复处理
property bool isTouchLongPressed: false

TapHandler {
acceptedDevices: PointerDevice.TouchScreen
gesturePolicy: TapHandler.DragThreshold
onLongPressed: {
mouseArea.isTouchLongPressed = true
root.menuTriggered()
}
}

onPressed: function (mouse) {
isTouchLongPressed = false
if (mouse.button === Qt.LeftButton && root.dndEnabled) {
root.Drag.hotSpot = mapToItem(iconLoader, Qt.point(mouse.x, mouse.y))
iconLoader.grabToImage(function(result) {
Expand Down Expand Up @@ -146,6 +160,11 @@ Control {
}
}
onClicked: function(mouse) {
if (isTouchLongPressed) {
isTouchLongPressed = false
return
}

if (mouse.button === Qt.LeftButton) {
if (model.itemType === ItemArrangementProxyModel.FolderItemType) {
root.folderClicked()
Expand All @@ -156,12 +175,6 @@ Control {
root.menuTriggered()
}
}
// touchscreen long press.
onPressAndHold: function (mouse) {
if (mouse.button === Qt.NoButton) {
root.menuTriggered()
}
}
}
}

Expand Down
24 changes: 18 additions & 6 deletions qml/windowed/AppListView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,27 +225,39 @@ FocusScope {
// 当分类菜单打开时，禁用拖拽功能
enabled: !(ddeCategoryMenu.visible || alphabetCategoryPopup.visible)

// 记录是否是触摸长按导致的，防止在 onClicked 中重复处理
property bool isTouchLongPressed: false

TapHandler {
acceptedDevices: PointerDevice.TouchScreen
gesturePolicy: TapHandler.DragThreshold
onLongPressed: {
mouseArea.isTouchLongPressed = true
showContextMenu(itemDelegate, model)
}
}

onPressed: function (mouse) {
isTouchLongPressed = false
if (mouse.button === Qt.LeftButton) {
itemDelegate.contentItem.grabToImage(function(result) {
itemDelegate.Drag.imageSource = result.url
})
}
}
onClicked: function (mouse) {
if (isTouchLongPressed) {
isTouchLongPressed = false
return
}

if (mouse.button === Qt.RightButton) {
showContextMenu(itemDelegate, model)
baseLayer.focus = true
} else {
launchApp(desktopId)
}
}
// touchscreen long press.
onPressAndHold: function (mouse) {
if (mouse.button === Qt.NoButton) {
showContextMenu(itemDelegate, model)
}
}
}
background: ItemBackground {
implicitWidth: DStyle.Style.itemDelegate.width
Expand Down
31 changes: 21 additions & 10 deletions qml/windowed/FreeSortListView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,23 @@ Item {
acceptedButtons: Qt.LeftButton | Qt.RightButton
drag.target: itemDelegate

// 记录是否是触摸长按导致的，防止在 onClicked 中重复处理
property bool isTouchLongPressed: false

TapHandler {
acceptedDevices: PointerDevice.TouchScreen
gesturePolicy: TapHandler.DragThreshold
onLongPressed: {
mouseArea.isTouchLongPressed = true
showContextMenu(itemDelegate, model, {
hideMoveToTopMenu: index === 0
})
baseLayer.focus = true
}
}

onPressed: function (mouse) {
isTouchLongPressed = false
if (mouse.button === Qt.LeftButton) {
itemDelegate.contentItem.grabToImage(function(result) {
itemDelegate.Drag.imageSource = result.url
Expand All @@ -341,6 +357,11 @@ Item {
}

onClicked: function (mouse) {
if (isTouchLongPressed) {
isTouchLongPressed = false
return
}

if (mouse.button === Qt.RightButton) {
showContextMenu(itemDelegate, model, {
hideMoveToTopMenu: index === 0
Expand All @@ -350,16 +371,6 @@ Item {
launchItem()
}
}

// touchscreen long press.
onPressAndHold: function (mouse) {
if (mouse.button === Qt.NoButton) {
showContextMenu(itemDelegate, model, {
hideMoveToTopMenu: index === 0
})
baseLayer.focus = true
}
}
}
}

Expand Down
25 changes: 19 additions & 6 deletions qml/windowed/IconItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,37 @@ Control {
acceptedButtons: Qt.LeftButton
enabled: true
drag.target: root.dndEnabled ? root : null

// 记录是否是触摸长按导致的，防止在 onClicked 中重复处理
property bool isTouchLongPressed: false

TapHandler {
acceptedDevices: PointerDevice.TouchScreen
gesturePolicy: TapHandler.DragThreshold
onLongPressed: {
mouseArea.isTouchLongPressed = true
root.menuTriggered()
}
}

onPressed: function (mouse) {
isTouchLongPressed = false
if (mouse.button === Qt.LeftButton && root.dndEnabled) {
appIcon.grabToImage(function(result) {
root.Drag.imageSource = result.url;
})
}
}
onClicked: {
if (isTouchLongPressed) {
isTouchLongPressed = false
return
}

if (!drag.active) {
root.itemClicked()
}
}
// touchscreen long press.
onPressAndHold: function (mouse) {
if (mouse.button === Qt.NoButton) {
root.menuTriggered()
}
}
}
contentItem: Column {
anchors.fill: parent
Expand Down
Loading