From 5a6942d90cf7629e236d7f283ce82166d139609a Mon Sep 17 00:00:00 2001 From: listenerri Date: Wed, 20 Mar 2019 11:23:33 +0800 Subject: [PATCH] refactor: close button name of preview make a distinction between the name of buttons both of 2d and 3d mode Change-Id: I2b8c744bcc920707b74f9f98859851cc0399a461 --- frame/item/components/appsnapshot.cpp | 22 +++++++++++----------- frame/item/components/appsnapshot.h | 2 +- frame/item/components/floatingpreview.cpp | 18 +++++++++--------- frame/item/components/floatingpreview.h | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp index b2b837cc4..18f6e215d 100644 --- a/frame/item/components/appsnapshot.cpp +++ b/frame/item/components/appsnapshot.cpp @@ -56,14 +56,14 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent) , m_wid(wid) , m_title(new TipsWidget) , m_waitLeaveTimer(new QTimer(this)) - , m_closeBtn(new DImageButton) + , m_closeBtn2D(new DImageButton) , m_wmHelper(DWindowManagerHelper::instance()) { - m_closeBtn->setFixedSize(24, 24); - m_closeBtn->setNormalPic(":/icons/resources/close_round_normal.svg"); - m_closeBtn->setHoverPic(":/icons/resources/close_round_hover.svg"); - m_closeBtn->setPressPic(":/icons/resources/close_round_press.svg"); - m_closeBtn->setVisible(false); + m_closeBtn2D->setFixedSize(24, 24); + m_closeBtn2D->setNormalPic(":/icons/resources/close_round_normal.svg"); + m_closeBtn2D->setHoverPic(":/icons/resources/close_round_hover.svg"); + m_closeBtn2D->setPressPic(":/icons/resources/close_round_press.svg"); + m_closeBtn2D->setVisible(false); m_title->setObjectName("AppSnapshotTitle"); m_waitLeaveTimer->setInterval(200); @@ -71,17 +71,17 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent) QHBoxLayout *centralLayout = new QHBoxLayout; centralLayout->addWidget(m_title); - centralLayout->addWidget(m_closeBtn); + centralLayout->addWidget(m_closeBtn2D); centralLayout->setSpacing(5); centralLayout->setMargin(0); - centralLayout->setAlignment(m_closeBtn, Qt::AlignRight); + centralLayout->setAlignment(m_closeBtn2D, Qt::AlignRight); setLayout(centralLayout); setAcceptDrops(true); resize(SNAP_WIDTH, SNAP_HEIGHT); - connect(m_closeBtn, &DImageButton::clicked, this, &AppSnapshot::closeWindow, Qt::QueuedConnection); + connect(m_closeBtn2D, &DImageButton::clicked, this, &AppSnapshot::closeWindow, Qt::QueuedConnection); connect(m_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, &AppSnapshot::compositeChanged, Qt::QueuedConnection); connect(m_waitLeaveTimer, &QTimer::timeout, this, [=] { emit entered(wid); @@ -205,7 +205,7 @@ void AppSnapshot::enterEvent(QEvent *e) QWidget::enterEvent(e); if (!m_wmHelper->hasComposite()) { - m_closeBtn->setVisible(true); + m_closeBtn2D->setVisible(true); } else { m_waitLeaveTimer->start(); @@ -218,7 +218,7 @@ void AppSnapshot::leaveEvent(QEvent *e) { QWidget::leaveEvent(e); - m_closeBtn->setVisible(false); + m_closeBtn2D->setVisible(false); m_waitLeaveTimer->stop(); update(); diff --git a/frame/item/components/appsnapshot.h b/frame/item/components/appsnapshot.h index 4af429041..52bfcea7d 100644 --- a/frame/item/components/appsnapshot.h +++ b/frame/item/components/appsnapshot.h @@ -89,7 +89,7 @@ private: TipsWidget *m_title; QTimer *m_waitLeaveTimer; - DImageButton *m_closeBtn; + DImageButton *m_closeBtn2D; DWindowManagerHelper *m_wmHelper; }; diff --git a/frame/item/components/floatingpreview.cpp b/frame/item/components/floatingpreview.cpp index dea1c9bcf..3685648db 100644 --- a/frame/item/components/floatingpreview.cpp +++ b/frame/item/components/floatingpreview.cpp @@ -29,23 +29,23 @@ FloatingPreview::FloatingPreview(QWidget *parent) : QWidget(parent), - m_closeBtn(new DImageButton) + m_closeBtn3D(new DImageButton) { - m_closeBtn->setFixedSize(24, 24); - m_closeBtn->setNormalPic(":/icons/resources/close_round_normal.svg"); - m_closeBtn->setHoverPic(":/icons/resources/close_round_hover.svg"); - m_closeBtn->setPressPic(":/icons/resources/close_round_press.svg"); + m_closeBtn3D->setFixedSize(24, 24); + m_closeBtn3D->setNormalPic(":/icons/resources/close_round_normal.svg"); + m_closeBtn3D->setHoverPic(":/icons/resources/close_round_hover.svg"); + m_closeBtn3D->setPressPic(":/icons/resources/close_round_press.svg"); QVBoxLayout *centralLayout = new QVBoxLayout; - centralLayout->addWidget(m_closeBtn); - centralLayout->setAlignment(m_closeBtn, Qt::AlignRight | Qt::AlignTop); + centralLayout->addWidget(m_closeBtn3D); + centralLayout->setAlignment(m_closeBtn3D, Qt::AlignRight | Qt::AlignTop); centralLayout->setMargin(0); centralLayout->setSpacing(0); setLayout(centralLayout); setFixedSize(SNAP_WIDTH, SNAP_HEIGHT); - connect(m_closeBtn, &DImageButton::clicked, this, &FloatingPreview::onCloseBtnClicked); + connect(m_closeBtn3D, &DImageButton::clicked, this, &FloatingPreview::onCloseBtnClicked); } WId FloatingPreview::trackedWid() const @@ -66,7 +66,7 @@ void FloatingPreview::trackWindow(AppSnapshot * const snap) m_tracked->removeEventFilter(this); snap->installEventFilter(this); m_tracked = snap; - m_closeBtn->setVisible(m_tracked->closeAble()); + m_closeBtn3D->setVisible(m_tracked->closeAble()); const QRect r = rect(); const QRect sr = snap->geometry(); diff --git a/frame/item/components/floatingpreview.h b/frame/item/components/floatingpreview.h index a7e34459e..dc4c7fcd2 100644 --- a/frame/item/components/floatingpreview.h +++ b/frame/item/components/floatingpreview.h @@ -58,7 +58,7 @@ private slots: private: QPointer m_tracked; - DImageButton *m_closeBtn; + DImageButton *m_closeBtn3D; }; #endif // FLOATINGPREVIEW_H