Skip to content

fix(dock): prevent menu hide after touch long-press #1651

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
MyLeeJiEun wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −0
Open

fix(dock): prevent menu hide after touch long-press #1651

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
9 changes: 9 additions & 0 deletions panels/dock/package/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ Window {
id: dockContainer
width: dock.useColumnLayout ? dock.dockSize : parent.width
height: dock.useColumnLayout ? parent.height : dock.dockSize
property bool touchLongPressed: false
anchors {
left: parent.left
top: parent.top
Expand Down Expand Up @@ -437,6 +438,10 @@ Window {
acceptedButtons: Qt.NoButton
acceptedDevices: PointerDevice.TouchScreen
onTapped: function(eventPoint, button) {
if (dockContainer.touchLongPressed) {
dockContainer.touchLongPressed = false
return
}
let lastActive = MenuHelper.activeMenu
MenuHelper.closeCurrent()
dockMenuLoader.active = true
Expand All @@ -445,13 +450,17 @@ Window {
viewDeactivated()
}
onLongPressed: {
dockContainer.touchLongPressed = true
let lastActive = MenuHelper.activeMenu
MenuHelper.closeCurrent()
dockMenuLoader.active = true
if (lastActive !== dockMenuLoader.item) {
requestShowDockMenu()
}
}
onCanceled: {
dockContainer.touchLongPressed = false
}
}

HoverHandler {
Expand Down
Loading