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(plugins): scrolling on the item, popup will hide

Browse Source 
taskID=5507
This commit is contained in:
justforlxz 2019-05-30 14:01:37 +08:00
parent 82d6b4b38a
commit 8faa324e98
No known key found for this signature in database
GPG Key ID: 593AFD577C1B1A60
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frame/util/dockpopupwindow.cpp
View File

@ -48,7 +48,7 @@ DockPopupWindow::DockPopupWindow(QWidget *parent)
connect(m_acceptDelayTimer, &QTimer::timeout, this, &DockPopupWindow::accept); connect(m_acceptDelayTimer, &QTimer::timeout, this, &DockPopupWindow::accept);
connect(m_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, &DockPopupWindow::compositeChanged); connect(m_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, &DockPopupWindow::compositeChanged);
connect(m_regionInter, &DRegionMonitor::buttonRelease, this, &DockPopupWindow::onGlobMouseRelease); connect(m_regionInter, &DRegionMonitor::buttonPress, this, &DockPopupWindow::onGlobMouseRelease);
} }
DockPopupWindow::~DockPopupWindow() DockPopupWindow::~DockPopupWindow()
@ -79,11 +79,12 @@ void DockPopupWindow::show(const QPoint &pos, const bool model)
show(pos.x(), pos.y()); show(pos.x(), pos.y());
const bool regionRegistered = m_regionInter->registered(); if (m_regionInter->registered()) {
if (!m_model && regionRegistered) {
m_regionInter->unregisterRegion(); m_regionInter->unregisterRegion();
} else if (m_model && !regionRegistered) { }
QTimer::singleShot(100, this, [=] { m_regionInter->registerRegion(); });
if (m_model) {
m_regionInter->registerRegion();
} }
} }
@ -136,9 +137,13 @@ bool DockPopupWindow::eventFilter(QObject *o, QEvent *e)
void DockPopupWindow::onGlobMouseRelease(const QPoint &mousePos, const int flag) void DockPopupWindow::onGlobMouseRelease(const QPoint &mousePos, const int flag)
{ {
Q_UNUSED(flag);
Q_ASSERT(m_model); Q_ASSERT(m_model);
if (!((flag == DRegionMonitor::WatchedFlags::Button_Left) ||
(flag == DRegionMonitor::WatchedFlags::Button_Right))) {
return;
}
const QRect rect = QRect(pos(), size()); const QRect rect = QRect(pos(), size());
if (rect.contains(mousePos)) if (rect.contains(mousePos))
return; return;