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

Update previewcontainer.cpp

Browse Source
This commit is contained in:
SiamSami 2020-07-02 06:45:02 +06:00 committed by 偕臧
parent 5a15ae7f17
commit f459e944e0
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frame/item/components/previewcontainer.cpp
View File

@ -221,13 +221,11 @@ void PreviewContainer::dragLeaveEvent(QDragLeaveEvent *e)
void PreviewContainer::onSnapshotClicked(const WId wid) void PreviewContainer::onSnapshotClicked(const WId wid)
{ {
if (!m_wmHelper->hasComposite()) { Q_EMIT requestActivateWindow(wid);
emit requestActivateWindow(wid);
}
m_needActivate = true; m_needActivate = true;
// the leaveEvent of this widget will be called after this signal m_waitForShowPreviewTimer->stop();
Q_EMIT requestHidePopup(); requestCancelPreviewWindow();
requestHidePopup();
} }
void PreviewContainer::previewEntered(const WId wid) void PreviewContainer::previewEntered(const WId wid)
@ -250,6 +248,8 @@ void PreviewContainer::previewEntered(const WId wid)
m_floatingPreview->trackWindow(snap); m_floatingPreview->trackWindow(snap);
requestCancelPreviewWindow();
if (m_waitForShowPreviewTimer->isActive()) { if (m_waitForShowPreviewTimer->isActive()) {
return; return;
} }
@ -259,8 +259,11 @@ void PreviewContainer::previewEntered(const WId wid)
void PreviewContainer::previewFloating() void PreviewContainer::previewFloating()
{ {
m_floatingPreview->setVisible(true); if(!m_waitForShowPreviewTimer->isActive()){
m_floatingPreview->raise(); m_floatingPreview->setVisible(true);
m_floatingPreview->raise();
emit requestPreviewWindow(m_currentWId); requestPreviewWindow(m_currentWId);
}
return;
} }