From d24d69d41e8c221d1e4422ba067f6e5d8e2a0d06 Mon Sep 17 00:00:00 2001 From: chenjun <104487271+chenjun1982@users.noreply.github.com> Date: Wed, 9 Nov 2022 13:31:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20(#715)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按UI设计要求修改预览界面关闭按钮样式 Log: 修复应用预览图关闭按钮样式错误问题 Bug: https://pms.uniontech.com/bug-view-167311.html Influence: 按设计要求样式显示预览图关闭按钮 --- frame/item/components/floatingpreview.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/frame/item/components/floatingpreview.cpp b/frame/item/components/floatingpreview.cpp index 7264bf10a..c050722b3 100644 --- a/frame/item/components/floatingpreview.cpp +++ b/frame/item/components/floatingpreview.cpp @@ -14,15 +14,13 @@ FloatingPreview::FloatingPreview(QWidget *parent) : QWidget(parent) - , m_closeBtn3D(new DIconButton(this)) + , m_closeBtn3D(new DIconButton(DStyle::StandardPixmap::SP_CloseButton, this)) , m_titleBtn(new DPushButton(this)) { m_closeBtn3D->setObjectName("closebutton-3d"); m_closeBtn3D->setFixedSize(24, 24); m_closeBtn3D->setIconSize(QSize(24, 24)); - m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_normal.svg")); m_closeBtn3D->setFlat(true); - m_closeBtn3D->installEventFilter(this); m_titleBtn->setBackgroundRole(QPalette::Base); m_titleBtn->setForegroundRole(QPalette::Text); @@ -119,18 +117,6 @@ 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)) { - m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_hover.svg")); - } - else if (watched == m_closeBtn3D && event->type() == QEvent::HoverLeave) { - m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_normal.svg")); - } - else if (watched == m_closeBtn3D && event->type() == QEvent::MouseButtonPress) { - m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_press.svg")); - } - } - if (watched == m_tracked) { if (event->type() == QEvent::Destroy) { // 此处需要置空，否则当Destroy事件响应结束后，会在FloatingPreview::hideEvent使用m_tracked野指针