fix: tray plugin mouse right click cause dock crash (#352)

yixinshark · web-flow · commit b29f8d67ff90 · 2024-05-14T09:40:33.000+08:00
1.double screen and set extended mode 2.adjust dock height size 3.logout computer and then click the tray plugin right-click menu when the dock comes out Log: fix tray plugin mouse right click cause dock crash Issue: linuxdeepin/developer-center#8506 Influence: tray plugin menu display
diff --git a/panels/dock/tray/frame/window/quickpluginwindow.cpp b/panels/dock/tray/frame/window/quickpluginwindow.cpp
@@ -921,10 +921,15 @@ void QuickDockItem::mousePressEvent(QMouseEvent *event)
     }
 
     if (!m_contextMenu->actions().isEmpty()) {
-        m_contextMenu->popup(QCursor::pos());
+        QTimer::singleShot(0, this, [this]() {
+            QMenu contextMenu(this);
+            contextMenu.addActions(m_contextMenu->actions());
+            contextMenu.exec(QCursor::pos());
+        });
+
+        // Fixme: Can cause crash in some cases
+        //m_contextMenu->popup(QCursor::pos());
     }
-
-    return QWidget::mousePressEvent(event);
 }
 
 void QuickDockItem::enterEvent(QEnterEvent *event)

Original file line number	Diff line number	Diff line change
`@@ -921,10 +921,15 @@ void QuickDockItem::mousePressEvent(QMouseEvent *event)`
`921`	`921`	`}`
`922`	`922`
`923`	`923`	`if (!m_contextMenu->actions().isEmpty()) {`
`924`		`- m_contextMenu->popup(QCursor::pos());`
	`924`	`+ QTimer::singleShot(0, this, [this]() {`
	`925`	`+ QMenu contextMenu(this);`
	`926`	`+ contextMenu.addActions(m_contextMenu->actions());`
	`927`	`+ contextMenu.exec(QCursor::pos());`
	`928`	`+ });`
	`929`	`+`
	`930`	`+ // Fixme: Can cause crash in some cases`
	`931`	`+ //m_contextMenu->popup(QCursor::pos());`
`925`	`932`	`}`
`926`		`-`
`927`		`- return QWidget::mousePressEvent(event);`
`928`	`933`	`}`
`929`	`934`
`930`	`935`	`void QuickDockItem::enterEvent(QEnterEvent *event)`