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

Browse Source 
Change-Id: I63f02ee8763e4b950f68477adee891f1ed3ee0fd
This commit is contained in:
石博文 2017-11-15 20:43:26 +08:00 committed by Deepin Code Review
parent 99b8549372
commit fc8e266ef7
Notes: Deepin Code Review 2017-11-16 16:36:29 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Thu, 16 Nov 2017 16:36:29 +0800
Reviewed-on: https://cr.deepin.io/28517
Project: dde/dde-dock
Branch: refs/heads/master
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frame/item/dockitem.cpp
View File

@ -304,5 +304,6 @@ void DockItem::hidePopup()
m_popupShown = false; m_popupShown = false;
PopupWindow->hide(); PopupWindow->hide();
emit PopupWindow->accept();
emit requestWindowAutoHide(true); emit requestWindowAutoHide(true);
} }

5
frame/item/launcheritem.cpp
View File

@ -86,15 +86,14 @@ void LauncherItem::resizeEvent(QResizeEvent *e)
void LauncherItem::mousePressEvent(QMouseEvent *e) void LauncherItem::mousePressEvent(QMouseEvent *e)
{ {
hidePopup();
if (e->button() == Qt::RightButton/* && !perfectIconRect().contains(e->pos())*/) if (e->button() == Qt::RightButton/* && !perfectIconRect().contains(e->pos())*/)
return QWidget::mousePressEvent(e); return QWidget::mousePressEvent(e);
if (e->button() != Qt::LeftButton) if (e->button() != Qt::LeftButton)
return; return;
// hide the tips window, because this window activate event will trigger dde-launcher auto-hide
hidePopup();
QProcess *proc = new QProcess; QProcess *proc = new QProcess;
connect(proc, static_cast<void (QProcess::*)(int)>(&QProcess::finished), proc, &QProcess::deleteLater); connect(proc, static_cast<void (QProcess::*)(int)>(&QProcess::finished), proc, &QProcess::deleteLater);