fix(preview): crash when click active item on 2d

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

View File

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