diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp index 769c485f0..80710afc4 100644 --- a/frame/item/components/appsnapshot.cpp +++ b/frame/item/components/appsnapshot.cpp @@ -44,7 +44,7 @@ using namespace Dock; AppSnapshot::AppSnapshot(const WId wid, QWidget *parent) : QWidget(parent) , m_wid(wid) - , m_closeAble(false) + , m_closeAble(true) , m_isWidowHidden(false) , m_title(new TipsWidget(this)) , m_3DtitleBtn(nullptr) @@ -311,17 +311,16 @@ void AppSnapshot::mousePressEvent(QMouseEvent *e) bool AppSnapshot::eventFilter(QObject *watched, QEvent *e) { if (watched == m_closeBtn2D) { - // TODO 判断条件重复 - if (watched == m_closeBtn2D && (e->type() == QEvent::HoverEnter || e->type() == QEvent::HoverMove)) { + if (e->type() == QEvent::HoverEnter || e->type() == QEvent::HoverMove) { m_closeBtn2D->setIcon(QIcon(":/icons/resources/close_round_hover.svg")); - } else if (watched == m_closeBtn2D && e->type() == QEvent::HoverLeave) { + } else if (e->type() == QEvent::HoverLeave) { m_closeBtn2D->setIcon(QIcon(":/icons/resources/close_round_normal.svg")); - } else if (watched == m_closeBtn2D && e->type() == QEvent::MouseButtonPress) { + } else if (e->type() == QEvent::MouseButtonPress) { m_closeBtn2D->setIcon(QIcon(":/icons/resources/close_round_press.svg")); } } - return false; + return QWidget::eventFilter(watched, e); } void AppSnapshot::resizeEvent(QResizeEvent *event) diff --git a/frame/item/components/floatingpreview.cpp b/frame/item/components/floatingpreview.cpp index 1ef009f58..c1e250675 100644 --- a/frame/item/components/floatingpreview.cpp +++ b/frame/item/components/floatingpreview.cpp @@ -126,14 +126,14 @@ void FloatingPreview::mouseReleaseEvent(QMouseEvent *e) bool FloatingPreview::eventFilter(QObject *watched, QEvent *event) { - if(watched == m_closeBtn3D) { - if(watched == m_closeBtn3D && (event->type() == QEvent::HoverEnter || event->type() == QEvent::HoverMove)) { + if (watched == m_closeBtn3D) { + if (event->type() == QEvent::HoverEnter || event->type() == QEvent::HoverMove) { m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_hover.svg")); } - else if (watched == m_closeBtn3D && event->type() == QEvent::HoverLeave) { + else if (event->type() == QEvent::HoverLeave) { m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_normal.svg")); } - else if (watched == m_closeBtn3D && event->type() == QEvent::MouseButtonPress) { + else if (event->type() == QEvent::MouseButtonPress) { m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_press.svg")); } } diff --git a/frame/item/components/previewcontainer.cpp b/frame/item/components/previewcontainer.cpp index c4982919d..425186278 100644 --- a/frame/item/components/previewcontainer.cpp +++ b/frame/item/components/previewcontainer.cpp @@ -68,7 +68,9 @@ void PreviewContainer::setWindowInfos(const WindowInfoMap &infos, const WindowLi if (!m_snapshots.contains(key)) appendSnapWidget(key); m_snapshots[key]->setWindowInfo(it.value()); - m_snapshots[key]->setCloseAble(allowClose.contains(key)); + // FIXME: "GetAllowedCloseWindows" has remove form dde-daemon + // 由于相关接口被移除,暂时无法正确设置 m_closeAble 属性,暂改为默认 true + // m_snapshots[key]->setCloseAble(allowClose.contains(key)); } if (m_snapshots.isEmpty()) {