Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: the context menu can not be shown when container item is clicked

Browse Source 
Change-Id: Id18625bd1886778e42bfd9b0116fa666f6a3b6d2
This commit is contained in:
listenerri 2018-11-01 14:53:45 +08:00
parent 860ed1046c
commit 22119b989a
Notes: gerrit 2018-11-01 16:27:50 +08:00 
Verified+1: <jenkins@deepin.com>
Verified+1: zhaofangfangdeepin <zhaofangfang@linuxdeepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Thu, 01 Nov 2018 16:27:49 +0800
Reviewed-on: https://cr.deepin.io/39379
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frame/item/dockitem.cpp
View File

@ -124,8 +124,13 @@ void DockItem::mousePressEvent(QMouseEvent *e)
m_popupTipsDelayTimer->stop();
hideNonModel();
if (e->button() == Qt::RightButton)
if (e->button() == Qt::RightButton) {
if (itemType() == ItemType::Container) {
// ignore this event to MainPanel/MainWindow to show context menu of MainWindow
return e->ignore();
}
return showContextMenu();
}
}
void DockItem::enterEvent(QEvent *e)