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(preview): crash when click active item on 2d

Browse Source 
bugID=515
This commit is contained in:
justforlxz 2019-05-22 16:39:31 +08:00
parent c94a4d69a5
commit 2b51e164aa
No known key found for this signature in database
GPG Key ID: 593AFD577C1B1A60
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,11 +116,13 @@ void PreviewContainer::checkMouseLeave()
m_floatingPreview->setVisible(false); m_floatingPreview->setVisible(false);
if (m_needActivate) { if (m_wmHelper->hasComposite()) {
m_needActivate = false; if (m_needActivate) {
emit requestActivateWindow(m_floatingPreview->trackedWid()); m_needActivate = false;
} else { emit requestActivateWindow(m_floatingPreview->trackedWid());
emit requestCancelPreviewWindow(); } else {
emit requestCancelPreviewWindow();
}
} }
emit requestHidePopup(); emit requestHidePopup();
@ -217,7 +219,9 @@ void PreviewContainer::dragLeaveEvent(QDragLeaveEvent *e)
void PreviewContainer::onSnapshotClicked(const WId wid) void PreviewContainer::onSnapshotClicked(const WId wid)
{ {
Q_UNUSED(wid); if (!m_wmHelper->hasComposite()) {
emit requestActivateWindow(wid);
}
m_needActivate = true; m_needActivate = true;
// the leaveEvent of this widget will be called after this signal // the leaveEvent of this widget will be called after this signal