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

optimize dock position

Browse Source 
Change-Id: I770071fe85541df9f3c1f1e16e4f4f110f721fb9
This commit is contained in:
石博文 2017-11-16 16:04:59 +08:00
parent f61b1e6831
commit 99b8549372
Notes: Deepin Code Review 2017-11-16 16:21:00 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Thu, 16 Nov 2017 16:20:59 +0800
Reviewed-on: https://cr.deepin.io/28537
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
frame/window/mainwindow.cpp
View File

@ -163,7 +163,6 @@ void MainWindow::setFixedSize(const QSize &size)
if (state == QPropertyAnimation::Running)
return m_sizeChangeAni->setEndValue(size);
qDebug() << Q_FUNC_INFO << size;
m_sizeChangeAni->setStartValue(this->size());
@ -231,22 +230,31 @@ void MainWindow::interalMove(const QPoint &p)
const QRect &r = m_settings->primaryRawRect();
switch (m_settings->position())
{
case Left: rp.setX(r.x() - 1); break;
case Top: rp.setY(r.y() - 1); break;
case Right: rp.setX(r.right() - 2); break;
case Bottom: rp.setY(r.bottom() - 2); break;
case Left: rp.setX(r.x()); break;
case Top: rp.setY(r.y()); break;
case Right: rp.setX(r.right() - 1); break;
case Bottom: rp.setY(r.bottom() - 1); break;
}
}
int h;
int hx = 2, wx = 2;
if (m_settings->hideMode() != HideMode::KeepShowing &&
m_settings->hideState() == HideState::Hide &&
m_panelHideAni->state() == QVariantAnimation::Stopped)
h = 2;
else
h = height() * ratio;
{
switch (m_settings->position())
{
case Top:
case Bottom:
wx = width() * ratio;
break;
case Left:
case Right:
hx = height() * ratio;
}
}
windowHandle()->handle()->setGeometry(QRect(rp.x(), rp.y(), width() * ratio, h));
windowHandle()->handle()->setGeometry(QRect(rp.x(), rp.y(), wx, hx));
}
void MainWindow::initConnections()
@ -270,6 +278,7 @@ void MainWindow::initConnections()
connect(m_panelHideAni, &QPropertyAnimation::finished, this, &MainWindow::adjustShadowMask);
connect(m_panelShowAni, &QPropertyAnimation::finished, this, &MainWindow::adjustShadowMask);
connect(m_posChangeAni, &QVariantAnimation::valueChanged, this, static_cast<void (MainWindow::*)()>(&MainWindow::interalMove));
connect(m_posChangeAni, &QVariantAnimation::finished, this, static_cast<void (MainWindow::*)()>(&MainWindow::interalMove), Qt::QueuedConnection);
// // to fix qt animation bug, sometimes window size not change
connect(m_sizeChangeAni, &QPropertyAnimation::valueChanged, [this] {