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

refactor: close button name of preview

Browse Source 
make a distinction between the name of buttons both of 2d and 3d mode

Change-Id: I2b8c744bcc920707b74f9f98859851cc0399a461
This commit is contained in:
listenerri 2019-03-20 11:23:33 +08:00
parent 6417a6255c
commit 5a6942d90c
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frame/item/components/appsnapshot.cpp
View File

@ -56,14 +56,14 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent)
, m_wid(wid) , m_wid(wid)
, m_title(new TipsWidget) , m_title(new TipsWidget)
, m_waitLeaveTimer(new QTimer(this)) , m_waitLeaveTimer(new QTimer(this))
, m_closeBtn(new DImageButton) , m_closeBtn2D(new DImageButton)
, m_wmHelper(DWindowManagerHelper::instance()) , m_wmHelper(DWindowManagerHelper::instance())
{ {
m_closeBtn->setFixedSize(24, 24); m_closeBtn2D->setFixedSize(24, 24);
m_closeBtn->setNormalPic(":/icons/resources/close_round_normal.svg"); m_closeBtn2D->setNormalPic(":/icons/resources/close_round_normal.svg");
m_closeBtn->setHoverPic(":/icons/resources/close_round_hover.svg"); m_closeBtn2D->setHoverPic(":/icons/resources/close_round_hover.svg");
m_closeBtn->setPressPic(":/icons/resources/close_round_press.svg"); m_closeBtn2D->setPressPic(":/icons/resources/close_round_press.svg");
m_closeBtn->setVisible(false); m_closeBtn2D->setVisible(false);
m_title->setObjectName("AppSnapshotTitle"); m_title->setObjectName("AppSnapshotTitle");
m_waitLeaveTimer->setInterval(200); m_waitLeaveTimer->setInterval(200);
@ -71,17 +71,17 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent)
QHBoxLayout *centralLayout = new QHBoxLayout; QHBoxLayout *centralLayout = new QHBoxLayout;
centralLayout->addWidget(m_title); centralLayout->addWidget(m_title);
centralLayout->addWidget(m_closeBtn); centralLayout->addWidget(m_closeBtn2D);
centralLayout->setSpacing(5); centralLayout->setSpacing(5);
centralLayout->setMargin(0); centralLayout->setMargin(0);
centralLayout->setAlignment(m_closeBtn, Qt::AlignRight); centralLayout->setAlignment(m_closeBtn2D, Qt::AlignRight);
setLayout(centralLayout); setLayout(centralLayout);
setAcceptDrops(true); setAcceptDrops(true);
resize(SNAP_WIDTH, SNAP_HEIGHT); 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_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, &AppSnapshot::compositeChanged, Qt::QueuedConnection);
connect(m_waitLeaveTimer, &QTimer::timeout, this, [=] { connect(m_waitLeaveTimer, &QTimer::timeout, this, [=] {
emit entered(wid); emit entered(wid);
@ -205,7 +205,7 @@ void AppSnapshot::enterEvent(QEvent *e)
QWidget::enterEvent(e); QWidget::enterEvent(e);
if (!m_wmHelper->hasComposite()) { if (!m_wmHelper->hasComposite()) {
m_closeBtn->setVisible(true); m_closeBtn2D->setVisible(true);
} }
else { else {
m_waitLeaveTimer->start(); m_waitLeaveTimer->start();
@ -218,7 +218,7 @@ void AppSnapshot::leaveEvent(QEvent *e)
{ {
QWidget::leaveEvent(e); QWidget::leaveEvent(e);
m_closeBtn->setVisible(false); m_closeBtn2D->setVisible(false);
m_waitLeaveTimer->stop(); m_waitLeaveTimer->stop();
update(); update();

2
frame/item/components/appsnapshot.h
View File

@ -89,7 +89,7 @@ private:
TipsWidget *m_title; TipsWidget *m_title;
QTimer *m_waitLeaveTimer; QTimer *m_waitLeaveTimer;
DImageButton *m_closeBtn; DImageButton *m_closeBtn2D;
DWindowManagerHelper *m_wmHelper; DWindowManagerHelper *m_wmHelper;
}; };

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

@ -29,23 +29,23 @@
FloatingPreview::FloatingPreview(QWidget *parent) FloatingPreview::FloatingPreview(QWidget *parent)
: QWidget(parent), : QWidget(parent),
m_closeBtn(new DImageButton) m_closeBtn3D(new DImageButton)
{ {
m_closeBtn->setFixedSize(24, 24); m_closeBtn3D->setFixedSize(24, 24);
m_closeBtn->setNormalPic(":/icons/resources/close_round_normal.svg"); m_closeBtn3D->setNormalPic(":/icons/resources/close_round_normal.svg");
m_closeBtn->setHoverPic(":/icons/resources/close_round_hover.svg"); m_closeBtn3D->setHoverPic(":/icons/resources/close_round_hover.svg");
m_closeBtn->setPressPic(":/icons/resources/close_round_press.svg"); m_closeBtn3D->setPressPic(":/icons/resources/close_round_press.svg");
QVBoxLayout *centralLayout = new QVBoxLayout; QVBoxLayout *centralLayout = new QVBoxLayout;
centralLayout->addWidget(m_closeBtn); centralLayout->addWidget(m_closeBtn3D);
centralLayout->setAlignment(m_closeBtn, Qt::AlignRight | Qt::AlignTop); centralLayout->setAlignment(m_closeBtn3D, Qt::AlignRight | Qt::AlignTop);
centralLayout->setMargin(0); centralLayout->setMargin(0);
centralLayout->setSpacing(0); centralLayout->setSpacing(0);
setLayout(centralLayout); setLayout(centralLayout);
setFixedSize(SNAP_WIDTH, SNAP_HEIGHT); 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 WId FloatingPreview::trackedWid() const
@ -66,7 +66,7 @@ void FloatingPreview::trackWindow(AppSnapshot * const snap)
m_tracked->removeEventFilter(this); m_tracked->removeEventFilter(this);
snap->installEventFilter(this); snap->installEventFilter(this);
m_tracked = snap; m_tracked = snap;
m_closeBtn->setVisible(m_tracked->closeAble()); m_closeBtn3D->setVisible(m_tracked->closeAble());
const QRect r = rect(); const QRect r = rect();
const QRect sr = snap->geometry(); const QRect sr = snap->geometry();

2
frame/item/components/floatingpreview.h
View File

@ -58,7 +58,7 @@ private slots:
private: private:
QPointer<AppSnapshot> m_tracked; QPointer<AppSnapshot> m_tracked;
DImageButton *m_closeBtn; DImageButton *m_closeBtn3D;
}; };
#endif // FLOATINGPREVIEW_H #endif // FLOATINGPREVIEW_H