mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:15:21 +00:00
fix popup not hide when show menu
Change-Id: Icb645e72ed35324ca08014984f7f306c7ea1f919
This commit is contained in:
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
@ -307,7 +307,7 @@ void AppItem::mouseReleaseEvent(QMouseEvent *e)
|
||||
void AppItem::mousePressEvent(QMouseEvent *e)
|
||||
{
|
||||
m_updateIconGeometryTimer->stop();
|
||||
// hidePopup();
|
||||
hidePopup();
|
||||
|
||||
if (e->button() == Qt::RightButton)
|
||||
{
|
||||
@ -315,8 +315,9 @@ void AppItem::mousePressEvent(QMouseEvent *e)
|
||||
{
|
||||
QMetaObject::invokeMethod(this, "showContextMenu", Qt::QueuedConnection);
|
||||
return;
|
||||
} else
|
||||
} else {
|
||||
return QWidget::mousePressEvent(e);
|
||||
}
|
||||
}
|
||||
|
||||
if (e->button() == Qt::LeftButton)
|
||||
|
Loading…
x
Reference in New Issue
Block a user