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
18 changes: 8 additions & 10 deletions qml/windowed/AppListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -225,32 +225,30 @@ FocusScope {
// 当分类菜单打开时,禁用拖拽功能
enabled: !(ddeCategoryMenu.visible || alphabetCategoryPopup.visible)

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

TapHandler {
acceptedDevices: PointerDevice.TouchScreen
gesturePolicy: TapHandler.DragThreshold
onTapped: function(eventPoint, buttons) {
launchApp(desktopId)
}
onLongPressed: {
mouseArea.isTouchLongPressed = true
showContextMenu(itemDelegate, model)
}
}

onPressed: function (mouse) {
isTouchLongPressed = false
// 触屏合成的鼠标事件不接受,交给 Flickable 处理滚动
if (mouse.source !== undefined && mouse.source !== Qt.MouseEventNotSynthesized) {
mouse.accepted = false
return
}
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
Expand Down
19 changes: 8 additions & 11 deletions qml/windowed/FreeSortListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,13 @@ Item {
acceptedButtons: Qt.LeftButton | Qt.RightButton
drag.target: dndTarget

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

TapHandler {
acceptedDevices: PointerDevice.TouchScreen
gesturePolicy: TapHandler.DragThreshold
onTapped: function(eventPoint, buttons) {
launchItem()
}
onLongPressed: {
mouseArea.isTouchLongPressed = true
showContextMenu(itemDelegate, model, {
hideMoveToTopMenu: index === 0
})
Expand All @@ -351,20 +350,18 @@ Item {
}

onPressed: function (mouse) {
isTouchLongPressed = false
// 触屏合成的鼠标事件不接受,交给 Flickable 处理滚动
if (mouse.source !== undefined && mouse.source !== Qt.MouseEventNotSynthesized) {
mouse.accepted = false
return
}
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
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, {
hideMoveToTopMenu: index === 0
Expand Down
Loading