Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

add startup animation

Browse Source 
Change-Id: Iae14f668c1b525e982b8d8da029181adab577708
This commit is contained in:
石博文 2017-12-05 13:08:17 +08:00
parent 1c3ffb1133
commit 1efca7f945
Notes: Deepin Code Review 2017-12-05 13:14:34 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Tue, 05 Dec 2017 13:14:34 +0800
Reviewed-on: https://cr.deepin.io/29138
Project: dde/dde-dock
Branch: refs/heads/master
3 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/main.cpp
View File

@ -85,7 +85,7 @@ int main(int argc, char *argv[])
RegisterDdeSession();
QTimer::singleShot(500, &mw, &MainWindow::show);
QTimer::singleShot(500, &mw, &MainWindow::launch);
return app.exec();
}

49
frame/window/mainwindow.cpp
View File

@ -52,7 +52,8 @@ const QPoint rawXPosition(const QPoint &scaledPos)
MainWindow::MainWindow(QWidget *parent)
: QWidget(parent),
m_updatePanelVisible(true),
m_launched(false),
m_updatePanelVisible(false),
m_mainPanel(new MainPanel(this)),
@ -61,6 +62,8 @@ MainWindow::MainWindow(QWidget *parent)
m_positionUpdateTimer(new QTimer(this)),
m_expandDelayTimer(new QTimer(this)),
m_shadowMaskOptimizeTimer(new QTimer(this)),
m_sizeChangeAni(new QVariantAnimation(this)),
m_posChangeAni(new QVariantAnimation(this)),
m_panelShowAni(new QPropertyAnimation(m_mainPanel, "pos")),
@ -73,6 +76,7 @@ MainWindow::MainWindow(QWidget *parent)
setAttribute(Qt::WA_TranslucentBackground);
setAcceptDrops(true);
m_platformWindowHandle.setShadowRadius(0);
m_platformWindowHandle.setEnableBlurWindow(false);
m_platformWindowHandle.setTranslucentBackground(true);
m_platformWindowHandle.setWindowRadius(0);
@ -86,8 +90,6 @@ MainWindow::MainWindow(QWidget *parent)
initConnections();
m_mainPanel->setFixedSize(m_settings->windowSize());
updatePanelVisible();
}
MainWindow::~MainWindow()
@ -102,6 +104,32 @@ QRect MainWindow::panelGeometry()
return rect;
}
void MainWindow::launch()
{
narrow(m_settings->position());
QTimer::singleShot(400, this, [&] {
m_launched = true;
resetPanelEnvironment(false);
updateGeometry();
expand();
});
// set strut
QTimer::singleShot(600, this, [&] {
setStrutPartial();
});
// reset to right environment when animation finished
QTimer::singleShot(800, this, [&] {
m_updatePanelVisible = true;
updatePanelVisible();
});
qApp->processEvents();
QTimer::singleShot(1, this, &MainWindow::show);
}
void MainWindow::resizeEvent(QResizeEvent *e)
{
QWidget::resizeEvent(e);
@ -196,6 +224,9 @@ void MainWindow::initComponents()
m_expandDelayTimer->setSingleShot(true);
m_expandDelayTimer->setInterval(m_settings->expandTimeout());
m_shadowMaskOptimizeTimer->setSingleShot(true);
m_shadowMaskOptimizeTimer->setInterval(100);
m_sizeChangeAni->setEasingCurve(QEasingCurve::InOutCubic);
m_posChangeAni->setEasingCurve(QEasingCurve::InOutCubic);
m_panelShowAni->setEasingCurve(QEasingCurve::InOutCubic);
@ -274,6 +305,7 @@ void MainWindow::initConnections()
connect(m_positionUpdateTimer, &QTimer::timeout, this, &MainWindow::updatePosition, Qt::QueuedConnection);
connect(m_expandDelayTimer, &QTimer::timeout, this, &MainWindow::expand, Qt::QueuedConnection);
connect(m_shadowMaskOptimizeTimer, &QTimer::timeout, this, &MainWindow::adjustShadowMask);
connect(m_panelHideAni, &QPropertyAnimation::finished, this, &MainWindow::updateGeometry, Qt::QueuedConnection);
connect(m_panelHideAni, &QPropertyAnimation::finished, this, &MainWindow::adjustShadowMask);
@ -564,6 +596,9 @@ void MainWindow::narrow(const Position prevPos)
void MainWindow::resetPanelEnvironment(const bool visible)
{
if (!m_launched)
return;
// reset environment
m_sizeChangeAni->stop();
m_posChangeAni->stop();
@ -626,7 +661,13 @@ void MainWindow::updatePanelVisible()
void MainWindow::adjustShadowMask()
{
// qDebug() << Q_FUNC_INFO << m_mainPanel->pos() << m_panelHideAni->state() << m_panelShowAni->state() << m_wmHelper->hasComposite();
if (!m_launched)
return;
if (m_shadowMaskOptimizeTimer->isActive())
return;
m_shadowMaskOptimizeTimer->start();
if (m_mainPanel->pos() != QPoint(0, 0) ||
m_panelHideAni->state() == QPropertyAnimation::Running ||
m_panelShowAni->state() == QPauseAnimation::Running ||

6
frame/window/mainwindow.h
View File

@ -45,7 +45,11 @@ public:
~MainWindow();
QRect panelGeometry();
public slots:
void launch();
private:
using QWidget::show;
void resizeEvent(QResizeEvent *e);
void mousePressEvent(QMouseEvent *e);
void keyPressEvent(QKeyEvent *e);
@ -83,6 +87,7 @@ private slots:
void adjustShadowMask();
private:
bool m_launched;
bool m_updatePanelVisible;
MainPanel *m_mainPanel;
@ -91,6 +96,7 @@ private:
QTimer *m_positionUpdateTimer;
QTimer *m_expandDelayTimer;
QTimer *m_shadowMaskOptimizeTimer;
QVariantAnimation *m_sizeChangeAni;
QVariantAnimation *m_posChangeAni;
QPropertyAnimation *m_panelShowAni;