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(2d): Clicking on the preview will crash

Browse Source
This commit is contained in:
justforlxz.com 2019-06-19 16:38:48 +08:00
parent 05da78a491
commit 4bb03fa9ae
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frame/item/components/floatingpreview.cpp
View File

@ -126,7 +126,9 @@ void FloatingPreview::mouseReleaseEvent(QMouseEvent *e)
{ {
QWidget::mouseReleaseEvent(e); QWidget::mouseReleaseEvent(e);
emit m_tracked->clicked(m_tracked->wid()); if (m_tracked) {
emit m_tracked->clicked(m_tracked->wid());
}
} }
bool FloatingPreview::eventFilter(QObject *watched, QEvent *event) bool FloatingPreview::eventFilter(QObject *watched, QEvent *event)
@ -139,7 +141,9 @@ bool FloatingPreview::eventFilter(QObject *watched, QEvent *event)
void FloatingPreview::hideEvent(QHideEvent *event) void FloatingPreview::hideEvent(QHideEvent *event)
{ {
m_tracked->setContentsMargins(0, 0, 0, 0); if (m_tracked) {
m_tracked->setContentsMargins(0, 0, 0, 0);
}
QWidget::hideEvent(event); QWidget::hideEvent(event);
} }

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

@ -186,7 +186,10 @@ void PreviewContainer::enterEvent(QEvent *e)
m_needActivate = false; m_needActivate = false;
m_mouseLeaveTimer->stop(); m_mouseLeaveTimer->stop();
m_waitForShowPreviewTimer->start();
if (m_wmHelper->hasComposite()) {
m_waitForShowPreviewTimer->start();
}
} }
void PreviewContainer::leaveEvent(QEvent *e) void PreviewContainer::leaveEvent(QEvent *e)