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

fix dock disappear when change visible mode

Browse Source 
Change-Id: I7de576df58dd54e58bf3846ef4549fc4c8a9fd69
This commit is contained in:
石博文 2017-01-12 18:38:06 +08:00
parent ea7ddbf17d
commit 62809dbb14
Notes: Deepin Code Review 2017-01-12 19:02:38 +08:00 
Verified+1: Anonymous Coward #1000004
Verified+1: <zhaofangfang@linuxdeepin.com>
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Thu, 12 Jan 2017 19:02:38 +0800
Reviewed-on: https://cr.deepin.io/19517
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frame/window/mainwindow.cpp
View File

@ -151,7 +151,7 @@ void MainWindow::initConnections()
connect(m_settings, &DockSettings::positionChanged, this, &MainWindow::positionChanged);
connect(m_settings, &DockSettings::windowGeometryChanged, this, &MainWindow::updateGeometry, Qt::DirectConnection);
connect(m_settings, &DockSettings::windowHideModeChanged, this, &MainWindow::setStrutPartial, Qt::QueuedConnection);
connect(m_settings, &DockSettings::windowHideModeChanged, [this] {resetPanelEnvironment(true);});
connect(m_settings, &DockSettings::windowHideModeChanged, [this] { resetPanelEnvironment(true); });
connect(m_settings, &DockSettings::windowVisibleChanegd, this, &MainWindow::updatePanelVisible, Qt::QueuedConnection);
connect(m_settings, &DockSettings::autoHideChanged, this, &MainWindow::updatePanelVisible);
@ -320,11 +320,12 @@ void MainWindow::setStrutPartial()
void MainWindow::expand()
{
// qDebug() << "expand";
// qDebug() << "expand";
const QPoint finishPos(0, 0);
if (m_mainPanel->pos() == finishPos && m_mainPanel->size() == this->size())
if (m_mainPanel->pos() == finishPos && m_mainPanel->size() == this->size() && m_panelHideAni->state() == QPropertyAnimation::Stopped)
return;
m_panelHideAni->stop();
resetPanelEnvironment(true);
@ -342,7 +343,6 @@ void MainWindow::expand()
case Right: startPos.setX(size.width()); break;
}
m_panelHideAni->stop();
m_panelShowAni->setStartValue(startPos);
m_panelShowAni->setEndValue(finishPos);
m_panelShowAni->start();
@ -350,7 +350,7 @@ void MainWindow::expand()
void MainWindow::narrow(const Position prevPos)
{
// qDebug() << "narrow";
// qDebug() << "narrow";
// const QSize size = m_settings->windowSize();
const QSize size = m_mainPanel->size();
@ -405,10 +405,12 @@ void MainWindow::resetPanelEnvironment(const bool visible)
void MainWindow::updatePanelVisible()
{
// qDebug() << m_updatePanelVisible;
if (!m_updatePanelVisible)
return;
if (m_settings->hideMode() == KeepShowing)
return;
return expand();
const Dock::HideState state = m_settings->hideState();