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 popup not hide when show menu

Browse Source 
Change-Id: Icb645e72ed35324ca08014984f7f306c7ea1f919
This commit is contained in:
石博文 2017-05-18 15:41:17 +08:00
parent 5c29c09347
commit f30631f3c8
Notes: Deepin Code Review 2017-05-20 09:29:25 +08:00 
Verified+1: Anonymous Coward #1000004
Verified+1: <zhaofangfang@linuxdeepin.com>
Verified+1: <yefei@linuxdeepin.com>
Code-Review+2: Hualet Wang <mr.asianwang@gmail.com>
Submitted-by: Hualet Wang <mr.asianwang@gmail.com>
Submitted-at: Sat, 20 May 2017 09:29:21 +0800
Reviewed-on: https://cr.deepin.io/23240
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frame/item/appitem.cpp
View File

@ -307,7 +307,7 @@ void AppItem::mouseReleaseEvent(QMouseEvent *e)
void AppItem::mousePressEvent(QMouseEvent *e) void AppItem::mousePressEvent(QMouseEvent *e)
{ {
m_updateIconGeometryTimer->stop(); m_updateIconGeometryTimer->stop();
// hidePopup(); hidePopup();
if (e->button() == Qt::RightButton) if (e->button() == Qt::RightButton)
{ {
@ -315,8 +315,9 @@ void AppItem::mousePressEvent(QMouseEvent *e)
{ {
QMetaObject::invokeMethod(this, "showContextMenu", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "showContextMenu", Qt::QueuedConnection);
return; return;
} else } else {
return QWidget::mousePressEvent(e); return QWidget::mousePressEvent(e);
}
} }
if (e->button() == Qt::LeftButton) if (e->button() == Qt::LeftButton)