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: 暂时屏蔽一处可能导致崩溃的地方

Browse Source 
这里有可能是qt的未发现的一个bug，有时间再修复

Log: 暂时屏蔽一处可能导致崩溃的地方
Change-Id: I0e04b5e1dbc783fc5e44cc1b16fbf632aead0260
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1495
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
This commit is contained in:
Fan PengCheng 2020-08-10 18:46:09 +08:00 committed by fanpengcheng
parent da5f72414a
commit d453013821
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frame/item/dockitem.cpp
View File

@ -40,7 +40,8 @@ DockItem::DockItem(QWidget *parent)
, m_popupShown(false)
, m_tapAndHold(false)
, m_draging(false)
, m_hoverEffect(new HoverHighlightEffect(this))
//FIXME: 可能是qt的bug，概率性导致崩溃，待修复
// , m_hoverEffect(new HoverHighlightEffect(this))
, m_popupTipsDelayTimer(new QTimer(this))
, m_popupAdjustDelayTimer(new QTimer(this))
@ -62,8 +63,8 @@ DockItem::DockItem(QWidget *parent)
m_popupAdjustDelayTimer->setInterval(10);
m_popupAdjustDelayTimer->setSingleShot(true);
setGraphicsEffect(m_hoverEffect);
//FIXME: 可能是qt的bug，概率性导致崩溃，待修复
// setGraphicsEffect(m_hoverEffect);
connect(m_popupTipsDelayTimer, &QTimer::timeout, this, &DockItem::showHoverTips);
connect(m_popupAdjustDelayTimer, &QTimer::timeout, this, &DockItem::updatePopupPosition, Qt::QueuedConnection);
@ -179,7 +180,8 @@ void DockItem::enterEvent(QEvent *e)
}
m_hover = true;
m_hoverEffect->setHighlighting(true);
//FIXME: 可能是qt的bug，概率性导致崩溃，待修复
// m_hoverEffect->setHighlighting(true);
m_popupTipsDelayTimer->start();
update();
@ -192,7 +194,8 @@ void DockItem::leaveEvent(QEvent *e)
QWidget::leaveEvent(e);
m_hover = false;
m_hoverEffect->setHighlighting(false);
//FIXME: 可能是qt的bug，概率性导致崩溃，待修复
// m_hoverEffect->setHighlighting(false);
m_popupTipsDelayTimer->stop();
// auto hide if popup is not model window

3
frame/item/dockitem.h
View File

@ -113,7 +113,8 @@ protected:
QMenu m_contextMenu;
QPointer<QWidget> m_lastPopupWidget;
QPointer<HoverHighlightEffect> m_hoverEffect;
//FIXME: 可能是qt的bug，概率性导致崩溃，待修复
// QPointer<HoverHighlightEffect> m_hoverEffect;
QTimer *m_popupTipsDelayTimer;
QTimer *m_popupAdjustDelayTimer;