Skip to content

fix: protocol error caused by frequent creation and destruction of Wa… #959

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
Dec 12, 2024
Merged

fix: protocol error caused by frequent creation and destruction of Wa… #959

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
23 changes: 22 additions & 1 deletion panels/dock/tray/SurfacePopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,18 @@ Item {
menu.close()
}
}

onMenuVisibleChanged: {
if (menuVisible) {
subMenuLoader.active = true
} else {
subMenuLoaderDelayTimer.start()
}
}

Loader {
active: menu.menuVisible
id: subMenuLoader
active: false
sourceComponent: SurfaceSubPopup {
objectName: "stashed's subPopup"
transientParent: menuWindow
Expand All @@ -83,6 +93,17 @@ Item {
return true
}
}

// Avoid protocol errors caused by d
Timer {
id: subMenuLoaderDelayTimer
interval: 1000
repeat: false
running: false
onTriggered: function () {
subMenuLoader.active = false
}
}
}
}

Expand Down
22 changes: 21 additions & 1 deletion panels/dock/tray/TrayItemSurfacePopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ Item {
menuX: DockPositioner.x
menuY: DockPositioner.y

onMenuVisibleChanged: {
if (menuVisible) {
subMenuLoader.active = true
} else {
subMenuLoaderDelayTimer.start()
}
}

Item {
anchors.fill: parent
ShellSurfaceItemProxy {
Expand All @@ -65,8 +73,20 @@ Item {
popupMenu.close()
}
}

// Avoid protocol errors caused by frequent creation and destruction of WaylandOutput.
Timer {
id: subMenuLoaderDelayTimer
interval: 1000
repeat: false
running: false
onTriggered: function () {
subMenuLoader.active = false
}
}
Loader {
active: popupMenu.menuVisible
id: subMenuLoader
active: false
sourceComponent: SurfaceSubPopup {
objectName: "tray's subPopup"
transientParent: popupMenu.menuWindow
Expand Down
Loading