Skip to content

fix: enable page-turn drag in full app folder rows #808

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

Open
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: enable page-turn drag in full app folder rows #808

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
28 changes: 24 additions & 4 deletions qml/FolderGridViewPopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ Popup {
readonly property int horizontalPadding: contentRoot.width * paddingColumns
anchors.fill: parent
property bool createdEmptyPage: false
property real lastDragX: 0

onEntered: root.onDragEnter(this)

Expand All @@ -201,10 +202,14 @@ Popup {
createdEmptyPage = false
}

function checkDragMove() {
if (drag.x < horizontalPadding) {
function checkDragMove(dragX) {
if (dragX === undefined) {
dragX = drag.x
}
lastDragX = dragX
if (dragX < horizontalPadding) {
pageIntent = -1
} else if (drag.x > (width - horizontalPadding)) {
} else if (dragX > (width - horizontalPadding)) {
let isLastPage = folderPagesView.currentIndex === folderPagesView.count - 1
if (isLastPage && folderPageDropArea.createdEmptyPage) {
return
Expand Down Expand Up @@ -254,7 +259,7 @@ Popup {
}
parent.pageIntent = 0
if (folderPagesView.currentIndex !== 0) {
parent.checkDragMove()
parent.checkDragMove(parent.lastDragX)
}
}
}
Expand Down Expand Up @@ -570,6 +575,13 @@ Popup {
if (dragId !== model.desktopId) {
isDragHover = true
}
let mappedX = mapToItem(folderPageDropArea, drag.x, 0).x
if (mappedX < folderPageDropArea.horizontalPadding || mappedX > (folderPageDropArea.width - folderPageDropArea.horizontalPadding)) {
folderDragApplyTimer.stop()
folderPageDropArea.checkDragMove(mappedX)
return
}
folderPageDropArea.pageIntent = 0
folderDragApplyTimer.dragId = dragId
folderDragApplyTimer.restart()
}
Expand All @@ -578,6 +590,13 @@ Popup {
if (dragId === model.desktopId) {
return
}
let mappedX = mapToItem(folderPageDropArea, drag.x, 0).x
if (mappedX < folderPageDropArea.horizontalPadding || mappedX > (folderPageDropArea.width - folderPageDropArea.horizontalPadding)) {
folderDragApplyTimer.stop()
folderPageDropArea.checkDragMove(mappedX)
return
}
folderPageDropArea.pageIntent = 0
folderDragApplyTimer.dragId = dragId
folderDragApplyTimer.currentDropX = drag.x
if (!folderDragApplyTimer.running) {
Expand All @@ -589,6 +608,7 @@ Popup {
root.onDragExit(this)
folderDragApplyTimer.stop()
folderDragApplyTimer.dragId = ""
folderPageDropArea.pageIntent = 0
}
Component.onDestruction: {
root.onDragExit(this)
Expand Down
Loading